From 728730de2e0069947b2d3614f23c42fd99fa069c Mon Sep 17 00:00:00 2001
From: Bryce Allen <ballen@ci.uchicago.edu>
Date: Thu, 3 Dec 2015 20:21:00 -0600
Subject: [PATCH] refactor layout, add jp sort pages, data update

---
 bin/mkmobilelist.py         | 169 ++++++++---
 bin/parse-wikia-monsters.py |   9 +-
 bin/parse-wikia-skills.py   |  53 ++++
 db/mhx_monster_list.json    | 200 +++++++++---
 db/mhx_skill_tree_list.json | 586 ++++++++++++++++++++++++++++++++++++
 web/translate/index.html    | 228 +++++++-------
 6 files changed, 1034 insertions(+), 211 deletions(-)
 create mode 100755 bin/parse-wikia-skills.py
 create mode 100644 db/mhx_skill_tree_list.json

diff --git a/bin/mkmobilelist.py b/bin/mkmobilelist.py
index 78c45c9..4ae1a2e 100755
--- a/bin/mkmobilelist.py
+++ b/bin/mkmobilelist.py
@@ -3,6 +3,7 @@
 import sys
 import json
 import os.path
+import types
 
 import _pathfix
 
@@ -10,67 +11,65 @@ from mhapi.db import MHDB
 from mhapi.util import get_utf8_writer
 
 
-def print_header_nav(current_page_id):
-    pages = [("page-skilltrees", "Skill Trees"),
-             ("page-items", "Items"),
-             ("page-gather", "Gather"),
-             ("page-carve", "Carve"),
-             ("page-hunterarts", "Hunter Arts"),
-             ("page-monsters", "Monsters")]
+def print_header_nav(title, pid):
     print """
-<div data-role="header" data-position="fixed">
-  <div data-role="navbar">
-    <ul>
-""".strip("\n")
-    for page_id, page_name in pages:
-        if current_page_id == page_id:
-            print """
-      <li><a href="#%s"
-             class="ui-btn-active ui-state-persist">%s</a></li>
-""".strip("\n") % (page_id, page_name)
-        else:
-            print """
-      <li><a href="#%s">%s</a></li>
-""".strip("\n") % (page_id, page_name)
-    print """
-    </ul>
-  </div>
-</div>
-""".strip("\n")
+  <div data-role="header" data-position="fixed">
+    <a href="#page-home" class="ui-btn-left ui-btn ui-btn-inline ui-mini ui-corner-all ui-btn-icon-left ui-icon-home">Home</a>
+    <h1>%s</h1>
+""".strip() % title
+
+    alt_pid = None
+    if pid.endswith("-en"):
+        alt_pid = pid.replace("-en", "-jp")
+        alt_title = "jp"
+    if pid.endswith("-jp"):
+        alt_pid = pid.replace("-jp", "-en")
+        alt_title = "en"
 
+    if alt_pid is not None:
+        print """
+    <a href="#%s" class="ui-btn-right ui-btn ui-btn-inline ui-mini">%s</a>
+""".strip() % (alt_pid, alt_title)
 
-def mk_html_list(dict_list, keys, sort_keys, divider_fn=None):
-    if divider_fn is None:
+    print "  </div>"
+
+
+def mk_html_list(dict_list, keys, sort_keys, divider_fn="auto"):
+    if divider_fn == "auto":
         print ('<ul data-role="listview" data-filter="true"'
                ' data-autodividers="true">')
     else:
         print '<ul data-role="listview" data-filter="true">'
 
-    def sort_fn(d):
-        return tuple(d[k] for k in sort_keys)
+    if isinstance(sort_keys, types.FunctionType):
+        sort_fn = sort_keys
+    else:
+        def sort_fn(d):
+            return tuple(d[k] for k in sort_keys)
     prev_d = None
     if sort_keys is not None:
         it = sorted(dict_list, key=sort_fn)
     else:
         it = dict_list
     for d in it:
-        if divider_fn is not None:
+        if divider_fn not in (None, "auto"):
             divider_text = divider_fn(d, prev_d)
             if divider_text is not None:
                 print '  <li data-role="list-divider">%s</li>' % divider_text
         print "  <li>"
-        for k in keys:
+        for i, k in enumerate(keys):
             value = d[k]
-            if k == "description":
+            if k in ("section", "description"):
                 if value:
                     print '    <p class="ui-li-desc">%s</p>' % value
                 continue
-            elif k == "title_jp":
-                if value not in ("", None, "None", "N/A", "(?)"):
+            elif k == "title_jp" and i != 0:
+                # NB: for monster by title we want it to be a normal column
+                if value:
                     print '    <p class="ui-li-desc">Title: %s</p>' % value
                 continue
             if value.endswith(".png"):
-                value = ('<img class="icon" src="/img/icons_items/%s" />'
+                value = ('<img class="icon" src="../img/icons_items/%s" />'
                          % value)
             print '    <span class="%s">%s</span>' % (k, value)
         print "  </li>"
@@ -80,7 +79,7 @@ def mk_html_list(dict_list, keys, sort_keys, divider_fn=None):
 
 def _main():
     db = MHDB()
-    strees = db.get_skill_trees()
+    #strees = db.get_skill_trees()
     items = db.get_items(item_types=("Tool", "Book", "Consumable", "Ammo"))
     gather_items = db.get_items(item_types=
                 ("Bone", "Plant", "Ore", "Fish", "Bug", "Sac/Fluid", "Meat"))
@@ -117,12 +116,41 @@ def _main():
 
 </head>
 <body>
+<div data-role="page" id="page-home">
+  <div data-role="header" data-position="fixed">
+    <h1>Home</h1>
+  </div>
+  <div data-role="main" class="ui-content">
+    <ul data-role="listview">
+      <li><a href="#page-skilltrees-en">Skill Trees</a></li>
+      <li><a href="#page-hunterarts-en">Hunter Arts</a></li>
+      <li><a href="#page-monsters-en">Monsters</a></li>
+      <li><a href="#page-monsters-title">Monster Titles</a></li>
+      <li data-role="list-divider">Items</li>
+      <li><a href="#page-item-usable">Usable</a></li>
+      <li><a href="#page-item-gather">Gatherable</a></li>
+      <li><a href="#page-item-carve">Monster Carves</a></li>
+    </ul>
+  </div>
+</div>
 """
+    stree_path = os.path.join(_pathfix.project_path, "db",
+                              "mhx_skill_tree_list.json")
+    with open(stree_path) as f:
+        stree_list = json.load(f)
 
-    print '<div data-role="page" id="page-skilltrees">'
-    print_header_nav("page-skilltrees")
+    print '<div data-role="page" id="page-skilltrees-en">'
+    print_header_nav("Skill Trees (en)", "page-skilltrees-en")
     print '<div data-role="main" class="ui-content">'
-    mk_html_list(strees, ("name", "name_jp"), ("name",))
+    mk_html_list(stree_list, ("name", "name_jp"), ("name",))
+    print '</div>'
+    print '</div>'
+
+    print '<div data-role="page" id="page-skilltrees-jp">'
+    print_header_nav("Skill Trees (jp)", "page-skilltrees-jp")
+    print '<div data-role="main" class="ui-content">'
+    mk_html_list(stree_list, ("name_jp", "name"), jplen_sort_fn,
+                              divider_fn=jplen_divider_fn)
     print '</div>'
     print '</div>'
 
@@ -132,24 +160,24 @@ def _main():
         if prefix != prev_prefix:
             return prefix
         return None
-    print '<div data-role="page" id="page-items">'
-    print_header_nav("page-items")
+    print '<div data-role="page" id="page-item-usable">'
+    print_header_nav("Items: Usable", "page-item-usable")
     print '<div data-role="main" class="ui-content">'
     mk_html_list(items, ("icon_name", "name", "name_jp"),
                  ("icon_name", "name"), divider_fn=item_divider_fn)
     print '</div>'
     print '</div>'
 
-    print '<div data-role="page" id="page-gather">'
-    print_header_nav("page-gather")
+    print '<div data-role="page" id="page-item-gather">'
+    print_header_nav("Items: Gatherable", "page-item-gather")
     print '<div data-role="main" class="ui-content">'
     mk_html_list(gather_items, ("icon_name", "name", "name_jp"),
                  ("icon_name", "name"), divider_fn=item_divider_fn)
     print '</div>'
     print '</div>'
 
-    print '<div data-role="page" id="page-carve">'
-    print_header_nav("page-carve")
+    print '<div data-role="page" id="page-item-carve">'
+    print_header_nav("Items: Carve", "page-item-carve")
     print '<div data-role="main" class="ui-content">'
     mk_html_list(carve_items, ("icon_name", "name", "name_jp"),
                  ("icon_name", "name"), divider_fn=item_divider_fn)
@@ -166,26 +194,53 @@ def _main():
         elif d["section"] != prev_d["section"]:
             return d["section"]
         return None
-    print '<div data-role="page" id="page-hunterarts">'
-    print_header_nav("page-hunterarts")
+    print '<div data-role="page" id="page-hunterarts-en">'
+    print_header_nav("Hunter Arts (en)", "page-hunterarts-en")
     print '<div data-role="main" class="ui-content">'
     mk_html_list(ha_list, ("name", "name_jp", "description"), None,
                  divider_fn=ha_divider_fn)
     print '</div>'
     print '</div>'
 
+    print '<div data-role="page" id="page-hunterarts-jp">'
+    print_header_nav("Hunter Arts (jp)", "page-hunterarts-jp")
+    print '<div data-role="main" class="ui-content">'
+    mk_html_list(ha_list, ("name_jp", "name", "section", "description"),
+                 jplen_sort_fn, divider_fn=jplen_divider_fn)
+    print '</div>'
+    print '</div>'
+
+
     monster_path = os.path.join(_pathfix.project_path, "db",
                                 "mhx_monster_list.json")
     with open(monster_path) as f:
         monster_list = json.load(f)
 
-    print '<div data-role="page" id="page-monsters">'
-    print_header_nav("page-monsters")
+    print '<div data-role="page" id="page-monsters-en">'
+    print_header_nav("Monsters (en)", "page-monsters-en")
     print '<div data-role="main" class="ui-content">'
     mk_html_list(monster_list, ("name", "name_jp", "title_jp"), ("name",))
     print '</div>'
     print '</div>'
 
+    print '<div data-role="page" id="page-monsters-jp">'
+    print_header_nav("Monsters (jp)", "page-monsters-jp")
+    print '<div data-role="main" class="ui-content">'
+    mk_html_list(monster_list, ("name_jp", "name", "title_jp"), ("name_jp",))
+    print '</div>'
+    print '</div>'
+
+    titled_monster_list = [m for m in monster_list if m["title_jp"]]
+    print '<div data-role="page" id="page-monsters-title">'
+    print_header_nav("Monster Titles", "page-monsters-title")
+    print '<div data-role="main" class="ui-content">'
+    mk_html_list(titled_monster_list, ("title_jp", "name"), ("title_jp",),
+                 divider_fn=None)
+    print '</div>'
+    print '</div>'
+
+
+
 
     print """
 </body>
@@ -198,6 +253,20 @@ def _icon_prefix(d):
     return parts[0].replace(".png", "")
 
 
+def jplen_divider_fn(d, prev_d):
+    jplen = len(d["name_jp"].strip(" I"))
+    if prev_d is None:
+        return jplen
+    prev_jplen = len(prev_d["name_jp"].strip(" I"))
+    if jplen != prev_jplen:
+        return jplen
+    return None
+
+
+def jplen_sort_fn(d):
+    return (len(d["name_jp"].strip(" I")), d["name_jp"])
+
+
 if __name__ == '__main__':
     sys.stdout = get_utf8_writer(sys.stdout)
     _main()
diff --git a/bin/parse-wikia-monsters.py b/bin/parse-wikia-monsters.py
index 4441718..f5c9664 100755
--- a/bin/parse-wikia-monsters.py
+++ b/bin/parse-wikia-monsters.py
@@ -60,6 +60,8 @@ def parse_wikia_monsters(f):
         m = MONSTER_RE.search(line)
         if m:
             monster = dict(href=m.group(1), name=m.group(2))
+            if monster["name"].startswith("File:"):
+                continue
             if monster["name"] not in seen:
                 data.append(monster)
                 seen.add(monster["name"])
@@ -95,11 +97,14 @@ def _main():
         names = get_jp_names(m["href"])
         if len(names) == 0:
             print >>sys.stderr, "ERROR: no names for %s" % name
-            names = ["(?)", "(?)"]
+            names = ["", ""]
         if len(names) == 1:
-            names.append("(?)")
+            print >>sys.stderr, "ERROR: no title for %s" % name
+            names.append("")
         m["name_jp"] = names[0]
         m["title_jp"] = names[1]
+        if m["title_jp"] in ("None", "N/A", "(?)"):
+            m["title_jp"] = ""
     print json.dumps(monster_list, indent=2)
 
 
diff --git a/bin/parse-wikia-skills.py b/bin/parse-wikia-skills.py
new file mode 100755
index 0000000..dfb959e
--- /dev/null
+++ b/bin/parse-wikia-skills.py
@@ -0,0 +1,53 @@
+#!/usr/bin/env python
+# -*- coding: utf8 -*-
+"""
+Parse skill tree names and jp names for monster hunter X.
+http://monsterhunter.wikia.com/wiki/MHX:_Skill_List
+
+Returns list of dict, e.g.:
+[
+  {
+    "name": "Testucabra",
+    "name_jp": "...",
+  },
+  ...
+]
+"""
+
+import sys
+import re
+import json
+from collections import defaultdict, OrderedDict
+
+import requests
+
+
+#<td rowspan="1" style="vertical-align: top; background-color: #ddeeee; font-size:12pt; border-bottom: 2px solid #000000;"><h3><span class="mw-headline" id="Ammo_Saver">Ammo Saver</span></h3>弾薬節約
+TREE_RE = re.compile('^<td [^>]*><h[23]><span class="mw-headline" id="[^"]*">(?:<b>)?([^<]*)(?:</b>)?</span></h[23]>([^<]*)')
+
+
+def parse_wikia_skill_trees(f):
+    data = []
+    seen = set()
+    while True:
+        line = f.readline()
+        if not line:
+            break
+        line = line.strip()
+        m = TREE_RE.match(line)
+        if m:
+            stree = dict(name=m.group(1), name_jp=m.group(2))
+            if stree["name"] not in seen:
+                data.append(stree)
+                seen.add(stree["name"])
+    return data
+
+
+def _main():
+    with open(sys.argv[1]) as f:
+        stree_list = parse_wikia_skill_trees(f)
+    print json.dumps(stree_list, indent=2)
+
+
+if __name__ == '__main__':
+    _main()
diff --git a/db/mhx_monster_list.json b/db/mhx_monster_list.json
index 222798e..785cdfe 100644
--- a/db/mhx_monster_list.json
+++ b/db/mhx_monster_list.json
@@ -5,6 +5,12 @@
     "name": "Agnaktor", 
     "name_jp": "\u30a2\u30b0\u30ca\u30b3\u30c8\u30eb"
   }, 
+  {
+    "title_jp": "\u8987\u7adc", 
+    "href": "/wiki/Akantor", 
+    "name": "Akantor", 
+    "name_jp": "\u30a2\u30ab\u30e0\u30c8\u30eb\u30e0"
+  }, 
   {
     "title_jp": "\u9752\u718a\u7363", 
     "href": "/wiki/Arzuros", 
@@ -53,12 +59,24 @@
     "name": "Spearbreaker Daimyo Hermitaur", 
     "name_jp": "\u77db\u7815\u30c0\u30a4\u30df\u30e7\u30a6\u30b6\u30b6\u30df"
   }, 
+  {
+    "title_jp": "\u6050\u66b4\u7adc", 
+    "href": "/wiki/Deviljho", 
+    "name": "Deviljho", 
+    "name_jp": "\u30a4\u30d3\u30eb\u30b8\u30e7\u30fc"
+  }, 
   {
     "title_jp": "\u65ac\u7adc", 
     "href": "/wiki/Dinovaldo", 
     "name": "Dinovaldo", 
     "name_jp": "\u30c7\u30a3\u30ce\u30d0\u30eb\u30c9"
   }, 
+  {
+    "title_jp": "\u71fc\u6ec5\u5203", 
+    "href": "/wiki/Incinerating_Blade_Dinovaldo", 
+    "name": "Incinerating Blade Dinovaldo", 
+    "name_jp": "\u71fc\u6ec5\u5203\u30c7\u30a3\u30ce\u30d0\u30eb\u30c9"
+  }, 
   {
     "title_jp": "\u5c3e\u69cc\u7adc", 
     "href": "/wiki/Duramboros", 
@@ -71,6 +89,12 @@
     "name": "Gamuto", 
     "name_jp": "\u30ac\u30e0\u30fc\u30c8"
   }, 
+  {
+    "title_jp": "", 
+    "href": "/wiki/Gendrome", 
+    "name": "Gendrome", 
+    "name_jp": "\u30c9\u30b9\u30b2\u30cd\u30dd\u30b9"
+  }, 
   {
     "title_jp": "\u9ed2\u8755\u7adc", 
     "href": "/wiki/Gore_Magala", 
@@ -78,7 +102,7 @@
     "name_jp": "\u30b4\u30a2\u30fb\u30de\u30ac\u30e9"
   }, 
   {
-    "title_jp": "(?)", 
+    "title_jp": "\u8df3\u72d7\u7adc", 
     "href": "/wiki/Great_Maccau", 
     "name": "Great Maccau", 
     "name_jp": "\u30c9\u30b9\u30de\u30c3\u30ab\u30a9"
@@ -96,7 +120,7 @@
     "name_jp": "\u30db\u30ed\u30ed\u30db\u30eb\u30eb"
   }, 
   {
-    "title_jp": "(?)", 
+    "title_jp": "", 
     "href": "/wiki/Iodrome", 
     "name": "Iodrome", 
     "name_jp": "\u30c9\u30b9\u30a4\u30fc\u30aa\u30b9"
@@ -125,6 +149,12 @@
     "name": "Lagombi", 
     "name_jp": "\u30a6\u30eb\u30af\u30b9\u30b9"
   }, 
+  {
+    "title_jp": "\u5927\u96ea\u4e3b", 
+    "href": "/wiki/Heavy_Snow_Lord_Lagombi", 
+    "name": "Heavy Snow Lord Lagombi", 
+    "name_jp": "\u5927\u96ea\u4e3b\u30a6\u30eb\u30af\u30b9\u30b9"
+  }, 
   {
     "title_jp": "\u6eb6\u5ca9\u7adc", 
     "href": "/wiki/Lavasioth", 
@@ -145,8 +175,8 @@
   }, 
   {
     "title_jp": "\u98a8\u65ac\u308b\u767d\u5f71", 
-    "href": "/wiki/Nargacuga_Variant", 
-    "name": "Nargacuga Variant", 
+    "href": "/wiki/White_Gale_Nargacuga", 
+    "name": "White Gale Nargacuga", 
     "name_jp": "\u767d\u75be\u98a8\u30ca\u30eb\u30ac\u30af\u30eb\u30ac"
   }, 
   {
@@ -175,10 +205,16 @@
   }, 
   {
     "title_jp": "\u30c0\u30fc\u30af\u30cd\u30b9\u30ed\u30fc\u30c9", 
-    "href": "/wiki/Rathalos_Variant", 
-    "name": "Rathalos Variant", 
+    "href": "/wiki/Black_Flame_King_Rathalos", 
+    "name": "Black Flame King Rathalos", 
     "name_jp": "\u9ed2\u708e\u738b\u30ea\u30aa\u30ec\u30a6\u30b9"
   }, 
+  {
+    "title_jp": "\u9280\u706b\u7adc", 
+    "href": "/wiki/Silver_Rathalos", 
+    "name": "Silver Rathalos", 
+    "name_jp": "\u30ea\u30aa\u30ec\u30a6\u30b9\u5e0c\u5c11\u7a2e"
+  }, 
   {
     "title_jp": "\u96cc\u706b\u7adc", 
     "href": "/wiki/Rathian", 
@@ -187,16 +223,28 @@
   }, 
   {
     "title_jp": "\u30c7\u30c3\u30c9\u30ea\u30fc\u30d7\u30ea\u30f3\u30bb\u30b9", 
-    "href": "/wiki/Rathian_Variant", 
-    "name": "Rathian Variant", 
+    "href": "/wiki/Violet_Poison_Princess_Rathian", 
+    "name": "Violet Poison Princess Rathian", 
     "name_jp": "\u7d2b\u6bd2\u59eb\u30ea\u30aa\u30ec\u30a4\u30a2"
   }, 
+  {
+    "title_jp": "\u91d1\u706b\u7adc", 
+    "href": "/wiki/Gold_Rathian", 
+    "name": "Gold Rathian", 
+    "name_jp": "\u30ea\u30aa\u30ec\u30a4\u30a2\u5e0c\u5c11\u7a2e"
+  }, 
   {
     "title_jp": "\u6c34\u7363", 
     "href": "/wiki/Royal_Ludroth", 
     "name": "Royal Ludroth", 
     "name_jp": "\u30ed\u30a2\u30eb\u30c9\u30ed\u30b9"
   }, 
+  {
+    "title_jp": "\u5fb9\u7532\u866b", 
+    "href": "/wiki/Seltas", 
+    "name": "Seltas", 
+    "name_jp": "\u30a2\u30eb\u30bb\u30eb\u30bf\u30b9"
+  }, 
   {
     "title_jp": "\u91cd\u7532\u866b", 
     "href": "/wiki/Seltas_Queen", 
@@ -228,10 +276,10 @@
     "name_jp": "\u30c6\u30c4\u30ab\u30d6\u30e9"
   }, 
   {
-    "title_jp": "(?)", 
-    "href": "/wiki/Tetsucabra_Variant", 
-    "name": "Tetsucabra Variant", 
-    "name_jp": "(?)"
+    "title_jp": "\u60aa\u76f8\u306e\u5343\u4e21\u5f79\u8005", 
+    "href": "/wiki/Rock_Piercing_Tetsucabra", 
+    "name": "Rock Piercing Tetsucabra", 
+    "name_jp": "\u5ca9\u7a7f\u30c6\u30c4\u30ab\u30d6\u30e9"
   }, 
   {
     "title_jp": "\u8f5f\u7adc", 
@@ -241,18 +289,24 @@
   }, 
   {
     "title_jp": "\u8352\u9264\u722a", 
-    "href": "/wiki/Tigrex_Variant", 
-    "name": "Tigrex Variant", 
+    "href": "/wiki/Ruinous_Hook_Claw_Tigrex", 
+    "name": "Ruinous Hook Claw Tigrex", 
     "name_jp": "\u8352\u9264\u722a\u30c6\u30a3\u30ac\u30ec\u30c3\u30af\u30b9"
   }, 
   {
-    "title_jp": "\u7206\u939a\u7adc", 
-    "href": "/wiki/Uragaan", 
-    "name": "Uragaan", 
-    "name_jp": "\u30a6\u30e9\u30ac\u30f3\u30ad\u30f3"
+    "title_jp": "\u5d29\u7adc", 
+    "href": "/wiki/Ukanlos", 
+    "name": "Ukanlos", 
+    "name_jp": "\u30a6\u30ab\u30e0\u30eb\u30d0\u30b9"
+  }, 
+  {
+    "title_jp": "\u5b9d\u7e8f", 
+    "href": "/wiki/Treasure_Clad_Uragaan", 
+    "name": "Treasure Clad Uragaan", 
+    "name_jp": "\u5b9d\u7e8f\u30a6\u30e9\u30ac\u30f3\u30ad\u30f3"
   }, 
   {
-    "title_jp": "(?)", 
+    "title_jp": "", 
     "href": "/wiki/Velocidrome", 
     "name": "Velocidrome", 
     "name_jp": "\u30c9\u30b9\u30e9\u30f3\u30dd\u30b9"
@@ -275,6 +329,12 @@
     "name": "Yian Garuga", 
     "name_jp": "\u30a4\u30e3\u30f3\u30ac\u30eb\u30eb\u30ac"
   }, 
+  {
+    "title_jp": "\u96bb\u773c", 
+    "href": "/wiki/One-Eyed_Yian_Garuga", 
+    "name": "One-Eyed Yian Garuga", 
+    "name_jp": "\u96bb\u773c\u30a4\u30e3\u30f3\u30ac\u30eb\u30eb\u30ac"
+  }, 
   {
     "title_jp": "\u5316\u3051\u9bab", 
     "href": "/wiki/Zamtrios", 
@@ -289,10 +349,16 @@
   }, 
   {
     "title_jp": "\u771f\u306a\u308b\u899a\u9192", 
-    "href": "/wiki/Zinogre_Variant", 
-    "name": "Zinogre Variant", 
+    "href": "/wiki/Golden_Thunder_Prince_Zinogre", 
+    "name": "Golden Thunder Prince Zinogre", 
     "name_jp": "\u91d1\u96f7\u516c\u30b8\u30f3\u30aa\u30a6\u30ac"
   }, 
+  {
+    "title_jp": "\u714c\u9ed2\u9f8d", 
+    "href": "/wiki/Alatreon", 
+    "name": "Alatreon", 
+    "name_jp": "\u30a2\u30eb\u30d0\u30c8\u30ea\u30aa\u30f3"
+  }, 
   {
     "title_jp": "\u5d50\u9f8d", 
     "href": "/wiki/Amatsumagatsuchi", 
@@ -317,6 +383,18 @@
     "name": "Kushala Daora", 
     "name_jp": "\u30af\u30b7\u30e3\u30eb\u30c0\u30aa\u30e9"
   }, 
+  {
+    "title_jp": "\u9ab8\u9f8d", 
+    "href": "/wiki/Osutogaroa", 
+    "name": "Osutogaroa", 
+    "name_jp": "\u30aa\u30b9\u30c8\u30ac\u30ed\u30a2"
+  }, 
+  {
+    "title_jp": "\u5929\u5efb\u9f8d", 
+    "href": "/wiki/Shagaru_Magala", 
+    "name": "Shagaru Magala", 
+    "name_jp": "\u30b7\u30e3\u30ac\u30eb\u30de\u30ac\u30e9"
+  }, 
   {
     "title_jp": "\u708e\u738b\u9f8d", 
     "href": "/wiki/Teostra", 
@@ -324,13 +402,7 @@
     "name_jp": "\u30c6\u30aa\u30fb\u30c6\u30b9\u30ab\u30c8\u30eb"
   }, 
   {
-    "title_jp": "(?)", 
-    "href": "/wiki/Unnamed_MHX_Elder_Dragon", 
-    "name": "Unnamed MHX Elder Dragon", 
-    "name_jp": "(?)"
-  }, 
-  {
-    "title_jp": "None", 
+    "title_jp": "", 
     "href": "/wiki/Zamite", 
     "name": "Zamite", 
     "name_jp": "\u30b9\u30af\u30a2\u30ae\u30eb"
@@ -342,13 +414,19 @@
     "name_jp": "\u30ac\u30fc\u30b0\u30a1"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Giaprey", 
     "name": "Giaprey", 
     "name_jp": "\u30ae\u30a2\u30ce\u30b9"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
+    "href": "/wiki/Genprey", 
+    "name": "Genprey", 
+    "name_jp": "\u30b2\u30cd\u30dd\u30b9"
+  }, 
+  {
+    "title_jp": "", 
     "href": "/wiki/Ioprey", 
     "name": "Ioprey", 
     "name_jp": "\u30a4\u30fc\u30aa\u30b9"
@@ -366,67 +444,67 @@
     "name_jp": "\u30b8\u30e3\u30ae\u30a3\u30ce\u30b9"
   }, 
   {
-    "title_jp": "(?)", 
+    "title_jp": "", 
     "href": "/wiki/Maccau", 
     "name": "Maccau", 
     "name_jp": "\u30de\u30c3\u30ab\u30a9"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Velociprey", 
     "name": "Velociprey", 
     "name_jp": "\u30e9\u30f3\u30dd\u30b9"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Ceanataur", 
     "name": "Ceanataur", 
     "name_jp": "\u30ac\u30df\u30b6\u30df"
   }, 
   {
-    "title_jp": "None", 
+    "title_jp": "", 
     "href": "/wiki/Hermitaur", 
     "name": "Hermitaur", 
     "name_jp": "\u30e4\u30aa\u30b6\u30df"
   }, 
   {
-    "title_jp": "None", 
+    "title_jp": "", 
     "href": "/wiki/Blango", 
     "name": "Blango", 
     "name_jp": "\u30d6\u30e9\u30f3\u30b4"
   }, 
   {
-    "title_jp": "None", 
+    "title_jp": "", 
     "href": "/wiki/Bullfango", 
     "name": "Bullfango", 
     "name_jp": "\u30d6\u30eb\u30d5\u30a1\u30f3\u30b4"
   }, 
   {
-    "title_jp": "None", 
+    "title_jp": "", 
     "href": "/wiki/Anteka", 
     "name": "Anteka", 
     "name_jp": "\u30ac\u30a6\u30b7\u30ab"
   }, 
   {
-    "title_jp": "None", 
+    "title_jp": "", 
     "href": "/wiki/Apceros", 
     "name": "Apceros", 
     "name_jp": "\u30a2\u30d7\u30b1\u30ed\u30b9"
   }, 
   {
-    "title_jp": "None", 
+    "title_jp": "", 
     "href": "/wiki/Aptonoth", 
     "name": "Aptonoth", 
     "name_jp": "\u30a2\u30d7\u30c8\u30ce\u30b9"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Kelbi", 
     "name": "Kelbi", 
     "name_jp": "\u30b1\u30eb\u30d3"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Mosswine", 
     "name": "Mosswine", 
     "name_jp": "\u30e2\u30b9"
@@ -438,7 +516,7 @@
     "name_jp": "\u30e0\u30fc\u30d5\u30a1"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Popo", 
     "name": "Popo", 
     "name_jp": "\u30dd\u30dd"
@@ -450,11 +528,17 @@
     "name_jp": "\u30ea\u30ce\u30d7\u30ed\u30b9"
   }, 
   {
-    "title_jp": "(?)", 
+    "title_jp": "\u9996\u9cf4\u7adc", 
     "href": "/wiki/Rimosetosu", 
     "name": "Rimosetosu", 
     "name_jp": "\u30ea\u30e2\u30bb\u30c8\u30b9"
   }, 
+  {
+    "title_jp": "\u5782\u76ae\u7adc", 
+    "href": "/wiki/Slagtoth", 
+    "name": "Slagtoth", 
+    "name_jp": "\u30ba\u30ef\u30ed\u30dd\u30b9"
+  }, 
   {
     "title_jp": "\u6c34\u751f\u7363", 
     "href": "/wiki/Ludroth", 
@@ -468,13 +552,13 @@
     "name_jp": "\u30a6\u30ed\u30b3\u30c8\u30eb"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Felyne", 
     "name": "Felyne", 
     "name_jp": "\u30a2\u30a4\u30eb\u30fc"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Melynx", 
     "name": "Melynx", 
     "name_jp": "\u30e1\u30e9\u30eb\u30fc"
@@ -492,21 +576,39 @@
     "name_jp": "\u30d6\u30ca\u30cf\u30d6\u30e9"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "", 
     "href": "/wiki/Hornetaur", 
     "name": "Hornetaur", 
     "name_jp": "\u30ab\u30f3\u30bf\u30ed\u30b9"
   }, 
   {
-    "title_jp": "N/A", 
+    "title_jp": "\u76fe\u866b", 
+    "href": "/wiki/Konchu", 
+    "name": "Konchu", 
+    "name_jp": "\u30af\u30f3\u30c1\u30e5\u30a6"
+  }, 
+  {
+    "title_jp": "", 
     "href": "/wiki/Vespoid", 
     "name": "Vespoid", 
     "name_jp": "\u30e9\u30f3\u30b4\u30b9\u30bf"
   }, 
   {
-    "title_jp": "\u7802\u7adc", 
+    "title_jp": "", 
     "href": "/wiki/Cephalos", 
     "name": "Cephalos", 
-    "name_jp": "\u30ac\u30ec\u30aa\u30b9"
+    "name_jp": ""
+  }, 
+  {
+    "title_jp": "", 
+    "href": "/wiki/Delex", 
+    "name": "Delex", 
+    "name_jp": "\u30c7\u30eb\u30af\u30b9"
+  }, 
+  {
+    "title_jp": "\u86c7\u7adc(2nd Gen)", 
+    "href": "/wiki/Remobra", 
+    "name": "Remobra", 
+    "name_jp": "\u30ac\u30d6\u30e9\u30b9"
   }
 ]
diff --git a/db/mhx_skill_tree_list.json b/db/mhx_skill_tree_list.json
new file mode 100644
index 0000000..4631bdc
--- /dev/null
+++ b/db/mhx_skill_tree_list.json
@@ -0,0 +1,586 @@
+[
+  {
+    "name_jp": "\u5f3e\u85ac\u7bc0\u7d04", 
+    "name": "Ammo Saver"
+  }, 
+  {
+    "name_jp": "\u7832\u8853", 
+    "name": "Artillery"
+  }, 
+  {
+    "name_jp": "\u76d7\u307f\u7121\u52b9", 
+    "name": "Anti-Theft"
+  }, 
+  {
+    "name_jp": "\u653b\u6483", 
+    "name": "Attack"
+  }, 
+  {
+    "name_jp": "\u30d9\u30eb\u30ca", 
+    "name": "Beruna"
+  }, 
+  {
+    "name_jp": "\u7d30\u83cc\u5b66", 
+    "name": "Biology"
+  }, 
+  {
+    "name_jp": "\u9ed2\u708e\u738b", 
+    "name": "Black Flame King"
+  }, 
+  {
+    "name_jp": "\u7206\u7834\u74f6\u8ffd\u52a0", 
+    "name": "Blast C+"
+  }, 
+  {
+    "name_jp": "\u88c2\u50b7", 
+    "name": "Bleeding"
+  }, 
+  {
+    "name_jp": "\u5c5e\u6027\u8010\u6027", 
+    "name": "Blight Res"
+  }, 
+  {
+    "name_jp": "\u920d\u5668", 
+    "name": "Blunt Weapon"
+  }, 
+  {
+    "name_jp": "\u7206\u5f3e\u5f37\u5316", 
+    "name": "Bomb Boost"
+  }, 
+  {
+    "name_jp": "\u6ce1\u6cab", 
+    "name": "Bubbles"
+  }, 
+  {
+    "name_jp": "\u63a5\u6483\u74f6\u8ffd\u52a0", 
+    "name": "C.Range C+"
+  }, 
+  {
+    "name_jp": "\u8089\u98df", 
+    "name": "Carnivore"
+  }, 
+  {
+    "name_jp": "\u5265\u304e\u53d6\u308a", 
+    "name": "Carving"
+  }, 
+  {
+    "name_jp": "\u30c1\u30e3\u30f3\u30b9", 
+    "name": "Chance"
+  }, 
+  {
+    "name_jp": "\u8b77\u77f3\u738b", 
+    "name": "Charmer"
+  }, 
+  {
+    "name_jp": "\u62e1\u6563\u5f3e\u8ffd\u52a0", 
+    "name": "Clust S+"
+  }, 
+  {
+    "name_jp": "\u5bd2\u51b7\u9069\u5fdc", 
+    "name": "Cold-Adapted"
+  }, 
+  {
+    "name_jp": "\u8010\u5bd2", 
+    "name": "Cold Res"
+  }, 
+  {
+    "name_jp": "\u8abf\u5408\u6570", 
+    "name": "Combo Plus"
+  }, 
+  {
+    "name_jp": "\u8abf\u5408\u6210\u529f\u7387", 
+    "name": "Combo Rate"
+  }, 
+  {
+    "name_jp": "\u9023\u6483", 
+    "name": "Combo Rush"
+  }, 
+  {
+    "name_jp": "\u4f53\u8853", 
+    "name": "Constitutn"
+  }, 
+  {
+    "name_jp": "\u69b4\u5f3e\u8ffd\u52a0", 
+    "name": "Crag S+"
+  }, 
+  {
+    "name_jp": "\u7d05\u515c", 
+    "name": "Crimson Helmet"
+  }, 
+  {
+    "name_jp": "\u629c\u5200\u4f1a\u5fc3", 
+    "name": "Crit Draw"
+  }, 
+  {
+    "name_jp": "\u4f1a\u5fc3\u5f37\u5316", 
+    "name": "Critical Boost"
+  }, 
+  {
+    "name_jp": "\u5c5e\u6027\u4f1a\u5fc3", 
+    "name": "CritElemnt"
+  }, 
+  {
+    "name_jp": "\u7279\u6b8a\u4f1a\u5fc3", 
+    "name": "CritStatus"
+  }, 
+  {
+    "name_jp": "\u3060\u308b\u307e", 
+    "name": "Daruma"
+  }, 
+  {
+    "name_jp": "\u5c04\u6cd5", 
+    "name": "Dead Eye"
+  }, 
+  {
+    "name_jp": "\u9632\u5fa1", 
+    "name": "Defense"
+  }, 
+  {
+    "name_jp": "\u5bfe\u9632\u5fa1DOWN", 
+    "name": "Def Lock"
+  }, 
+  {
+    "name_jp": "\u91cd\u6483", 
+    "name": "Destroyer"
+  }, 
+  {
+    "name_jp": "\u9f8d\u5c5e\u6027\u653b\u6483", 
+    "name": "Dragon Atk"
+  }, 
+  {
+    "name_jp": "\u9f8d\u8010\u6027", 
+    "name": "Dragon Res"
+  }, 
+  {
+    "name_jp": "\u98df\u4e8b", 
+    "name": "Eating"
+  }, 
+  {
+    "name_jp": "\u5c5e\u6027\u653b\u6483", 
+    "name": "Elemental"
+  }, 
+  {
+    "name_jp": "\u5c5e\u5f37\u74f6\u8ffd\u52a0", 
+    "name": "Elemental Boost C+"
+  }, 
+  {
+    "name_jp": "\u56de\u907f\u8ddd\u96e2", 
+    "name": "Evade Dist"
+  }, 
+  {
+    "name_jp": "\u56de\u907f\u6027\u80fd", 
+    "name": "Evasion"
+  }, 
+  {
+    "name_jp": "\u6e1b\u6c17\u74f6\u8ffd\u52a0", 
+    "name": "Exhaust C+"
+  }, 
+  {
+    "name_jp": "\u9054\u4eba", 
+    "name": "Expert"
+  }, 
+  {
+    "name_jp": "\u6e9c\u3081\u77ed\u7e2e", 
+    "name": "FastCharge"
+  }, 
+  {
+    "name_jp": "\u904b\u6c17", 
+    "name": "Fate"
+  }, 
+  {
+    "name_jp": "\u5263\u8853", 
+    "name": "Fencing"
+  }, 
+  {
+    "name_jp": "\u706b\u5c5e\u6027\u653b\u6483", 
+    "name": "Fire Atk"
+  }, 
+  {
+    "name_jp": "\u706b\u8010\u6027", 
+    "name": "Fire Res"
+  }, 
+  {
+    "name_jp": "\u72c2\u6483\u8010\u6027", 
+    "name": "Frenzy Res"
+  }, 
+  {
+    "name_jp": "\u63a1\u53d6", 
+    "name": "Gathering"
+  }, 
+  {
+    "name_jp": "\u672c\u6c17", 
+    "name": "Gloves Off"
+  }, 
+  {
+    "name_jp": "\u98df\u3044\u3057\u3093\u574a", 
+    "name": "Gluttony"
+  }, 
+  {
+    "name_jp": "\u91d1\u96f7\u516c", 
+    "name": "Golden Thunder Prince"
+  }, 
+  {
+    "name_jp": "\u30ac\u30fc\u30c9\u6027\u80fd", 
+    "name": "Guard"
+  }, 
+  {
+    "name_jp": "\u30ac\u30fc\u30c9\u5f37\u5316", 
+    "name": "Guard Up"
+  }, 
+  {
+    "name_jp": "\u6839\u6027", 
+    "name": "Guts"
+  }, 
+  {
+    "name_jp": "\u5320", 
+    "name": "Handicraft"
+  }, 
+  {
+    "name_jp": "\u4f53\u529b", 
+    "name": "Health"
+  }, 
+  {
+    "name_jp": "\u8074\u899a\u4fdd\u8b77", 
+    "name": "Hearing"
+  }, 
+  {
+    "name_jp": "\u708e\u71b1\u9069\u5fdc", 
+    "name": "Heat-Adapted"
+  }, 
+  {
+    "name_jp": "\u8010\u6691", 
+    "name": "Heat Res"
+  }, 
+  {
+    "name_jp": "\u5927\u96ea\u4e3b", 
+    "name": "Heavy Snow Lord"
+  }, 
+  {
+    "name_jp": "\u91cd\u6483\u5f3e\u5f37\u5316", 
+    "name": "Heavy Up"
+  }, 
+  {
+    "name_jp": "\u91ce\u8349\u77e5\u8b58", 
+    "name": "Herbology"
+  }, 
+  {
+    "name_jp": "\u82f1\u96c4\u306e\u76fe", 
+    "name": "Hero's Shield"
+  }, 
+  {
+    "name_jp": "\u30cf\u30c1\u30df\u30c4", 
+    "name": "Honey"
+  }, 
+  {
+    "name_jp": "\u8179\u6e1b\u308a", 
+    "name": "Hunger"
+  }, 
+  {
+    "name_jp": "\u6c37\u5c5e\u6027\u653b\u6483", 
+    "name": "Ice Atk"
+  }, 
+  {
+    "name_jp": "\u6c37\u8010\u6027", 
+    "name": "Ice Res"
+  }, 
+  {
+    "name_jp": "\u71fc\u6ec5\u5203", 
+    "name": "Incinerating Blade"
+  }, 
+  {
+    "name_jp": "\u5909\u5247\u5c04\u6483", 
+    "name": "Irregular Shot"
+  }, 
+  {
+    "name_jp": "KO", 
+    "name": "KO"
+  }, 
+  {
+    "name_jp": "\u30b3\u30b3\u30c3\u30c8", 
+    "name": "Kokoto"
+  }, 
+  {
+    "name_jp": "\u52b9\u679c\u6301\u7d9a", 
+    "name": "LastingPwr"
+  }, 
+  {
+    "name_jp": "\u8df3\u8e8d", 
+    "name": "Leaping"
+  }, 
+  {
+    "name_jp": "\u7bc0\u98df", 
+    "name": "LightEater"
+  }, 
+  {
+    "name_jp": "\u88c5\u586b\u6570", 
+    "name": "Loading"
+  }, 
+  {
+    "name_jp": "\u7121\u5fc3", 
+    "name": "Longing"
+  }, 
+  {
+    "name_jp": "\u7b1b", 
+    "name": "Maestro"
+  }, 
+  {
+    "name_jp": "\u4e57\u308a", 
+    "name": "Mounting"
+  }, 
+  {
+    "name_jp": "\u8338\u98df", 
+    "name": "Mycology"
+  }, 
+  {
+    "name_jp": "\u901a\u5e38\u5f3e\u8ffd\u52a0", 
+    "name": "Normal S+"
+  }, 
+  {
+    "name_jp": "\u901a\u5e38\u5f3e\u5f37\u5316", 
+    "name": "Normal Up"
+  }, 
+  {
+    "name_jp": "\u96bb\u773c", 
+    "name": "One-Eyed"
+  }, 
+  {
+    "name_jp": "\u9ebb\u75fa\u74f6\u8ffd\u52a0", 
+    "name": "Para C+"
+  }, 
+  {
+    "name_jp": "\u9ebb\u75fa", 
+    "name": "Paralysis"
+  }, 
+  {
+    "name_jp": "\u6563\u5f3e\u8ffd\u52a0", 
+    "name": "Pellet S+"
+  }, 
+  {
+    "name_jp": "\u6563\u5f3e\u5f37\u5316", 
+    "name": "Pellet Up"
+  }, 
+  {
+    "name_jp": "\u89b3\u5bdf\u773c", 
+    "name": "Perception"
+  }, 
+  {
+    "name_jp": "\u8cab\u901a\u5f3e\u8ffd\u52a0", 
+    "name": "Pierce S+"
+  }, 
+  {
+    "name_jp": "\u8cab\u901a\u5f3e\u5f37\u5316", 
+    "name": "Pierce Up"
+  }, 
+  {
+    "name_jp": "\u6bd2", 
+    "name": "Poison"
+  }, 
+  {
+    "name_jp": "\u6bd2\u74f6\u8ffd\u52a0", 
+    "name": "Poison C+"
+  }, 
+  {
+    "name_jp": "\u30dd\u30c3\u30b1", 
+    "name": "Pokke"
+  }, 
+  {
+    "name_jp": "\u7814\u78e8\u8853", 
+    "name": "Polisher"
+  }, 
+  {
+    "name_jp": "\u5e95\u529b", 
+    "name": "Potential"
+  }, 
+  {
+    "name_jp": "\u5f37\u6483\u74f6\u8ffd\u52a0", 
+    "name": "Power C+"
+  }, 
+  {
+    "name_jp": "\u7cbe\u5bc6\u5c04\u6483", 
+    "name": "Precision"
+  }, 
+  {
+    "name_jp": "\u52a0\u8b77", 
+    "name": "Protection"
+  }, 
+  {
+    "name_jp": "\u5343\u91cc\u773c", 
+    "name": "Psychic"
+  }, 
+  {
+    "name_jp": "\u629c\u5200\u6e1b\u6c17", 
+    "name": "PunishDraw"
+  }, 
+  {
+    "name_jp": "\u72e9\u4eba", 
+    "name": "Ranger"
+  }, 
+  {
+    "name_jp": "\u9006\u4e0a", 
+    "name": "Rebellious"
+  }, 
+  {
+    "name_jp": "\u56de\u5fa9\u91cf", 
+    "name": "Rec Level"
+  }, 
+  {
+    "name_jp": "\u56de\u5fa9\u901f\u5ea6", 
+    "name": "Rec Speed"
+  }, 
+  {
+    "name_jp": "\u53cd\u52d5", 
+    "name": "Recoil"
+  }, 
+  {
+    "name_jp": "\u901f\u5c04", 
+    "name": "Rapid Fire"
+  }, 
+  {
+    "name_jp": "\u88c5\u586b\u901f\u5ea6", 
+    "name": "Reload Spd"
+  }, 
+  {
+    "name_jp": "\u5ca9\u7a7f", 
+    "name": "Rock Piercing"
+  }, 
+  {
+    "name_jp": "\u8352\u9264\u722a", 
+    "name": "Ruinous Hook Claw"
+  }, 
+  {
+    "name_jp": "\u6c17\u914d", 
+    "name": "Sense"
+  }, 
+  {
+    "name_jp": "\u7814\u304e\u5e2b", 
+    "name": "Sharpener"
+  }, 
+  {
+    "name_jp": "\u65ac\u308c\u5473", 
+    "name": "Sharpness"
+  }, 
+  {
+    "name_jp": "\u7d0d\u5200", 
+    "name": "Sheathing"
+  }, 
+  {
+    "name_jp": "\u7761\u7720", 
+    "name": "Sleep"
+  }, 
+  {
+    "name_jp": "\u7761\u7720\u74f6\u8ffd\u52a0", 
+    "name": "Sleep C+"
+  }, 
+  {
+    "name_jp": "\u77db\u7815", 
+    "name": "Spearbreaker"
+  }, 
+  {
+    "name_jp": "\u9ad8\u901f\u8a2d\u7f6e", 
+    "name": "SpeedSetup"
+  }, 
+  {
+    "name_jp": "\u95d8\u9b42", 
+    "name": "Spirit"
+  }, 
+  {
+    "name_jp": "\u6e1b\u6c17\u653b\u6483", 
+    "name": "Stam Drain"
+  }, 
+  {
+    "name_jp": "\u6c17\u529b\u56de\u5fa9", 
+    "name": "Stam Recov"
+  }, 
+  {
+    "name_jp": "\u30b9\u30bf\u30df\u30ca", 
+    "name": "Stamina"
+  }, 
+  {
+    "name_jp": "\u7279\u6b8a\u653b\u6483", 
+    "name": "Status"
+  }, 
+  {
+    "name_jp": "\u6c17\u7d76", 
+    "name": "Stun"
+  }, 
+  {
+    "name_jp": "\u9006\u5883", 
+    "name": "Survivor"
+  }, 
+  {
+    "name_jp": "\u53f7\u4ee4", 
+    "name": "TeamLeader"
+  }, 
+  {
+    "name_jp": "\u91c7\u914d", 
+    "name": "TeamPlayer"
+  }, 
+  {
+    "name_jp": "\u75db\u6483", 
+    "name": "Tenderizer"
+  }, 
+  {
+    "name_jp": "\u96f7\u5c5e\u6027\u653b\u6483", 
+    "name": "ThunderAtk"
+  }, 
+  {
+    "name_jp": "\u96f7\u8010\u6027", 
+    "name": "ThunderRes"
+  }, 
+  {
+    "name_jp": "\u7aae\u5730", 
+    "name": "Tight Spot"
+  }, 
+  {
+    "name_jp": "\u6355\u7372", 
+    "name": "Tranquilzr"
+  }, 
+  {
+    "name_jp": "\u904b\u642c", 
+    "name": "Transportr"
+  }, 
+  {
+    "name_jp": "\u5b9d\u7e8f", 
+    "name": "Treasure Clad"
+  }, 
+  {
+    "name_jp": "\u8010\u9707", 
+    "name": "Tremor Res"
+  }, 
+  {
+    "name_jp": "\u7121\u50b7", 
+    "name": "Unscathed"
+  }, 
+  {
+    "name_jp": "\u7d2b\u6bd2\u59eb", 
+    "name": "Violet Poison Princess"
+  }, 
+  {
+    "name_jp": "\u6c34\u5c5e\u6027\u653b\u6483", 
+    "name": "Water Atk"
+  }, 
+  {
+    "name_jp": "\u6c34\u8010\u6027", 
+    "name": "Water Res"
+  }, 
+  {
+    "name_jp": "\u6c17\u307e\u3050\u308c", 
+    "name": "Whim"
+  }, 
+  {
+    "name_jp": "\u5e83\u57df", 
+    "name": "Wide-Range"
+  }, 
+  {
+    "name_jp": "\u767d\u75be\u98a8", 
+    "name": "White Gale"
+  }, 
+  {
+    "name_jp": "\u98a8\u5727", 
+    "name": "Wind Res"
+  }, 
+  {
+    "name_jp": "\u30e6\u30af\u30e2", 
+    "name": "Yukumo"
+  }
+]
diff --git a/web/translate/index.html b/web/translate/index.html
index eb7cd01..5abc1e1 100644
--- a/web/translate/index.html
+++ b/web/translate/index.html
@@ -45,17 +45,13 @@
 <div data-role="main" class="ui-content">
 <ul data-role="listview" data-filter="true" data-autodividers="true">
   <li>
-    <span class="name">Amplify</span>
-    <span class="name_jp">増幅</span>
+    <span class="name">Ammo Saver</span>
+    <span class="name_jp">弾薬節約</span>
   </li>
   <li>
     <span class="name">Anti-Theft</span>
     <span class="name_jp">盗み無効</span>
   </li>
-  <li>
-    <span class="name">Arcana</span>
-    <span class="name_jp">秘伝</span>
-  </li>
   <li>
     <span class="name">Artillery</span>
     <span class="name_jp">砲術</span>
@@ -65,24 +61,20 @@
     <span class="name_jp">攻撃</span>
   </li>
   <li>
-    <span class="name">Auto-Guard</span>
-    <span class="name_jp">自動防御</span>
-  </li>
-  <li>
-    <span class="name">Avarice</span>
-    <span class="name_jp">強欲</span>
+    <span class="name">Beruna</span>
+    <span class="name_jp">ベルナ</span>
   </li>
   <li>
     <span class="name">Biology</span>
     <span class="name_jp">細菌学</span>
   </li>
   <li>
-    <span class="name">Blast C+</span>
-    <span class="name_jp">爆破瓶追加</span>
+    <span class="name">Black Flame King</span>
+    <span class="name_jp">黒炎王</span>
   </li>
   <li>
-    <span class="name">Blast S+</span>
-    <span class="name_jp">爆破弾追加</span>
+    <span class="name">Blast C+</span>
+    <span class="name_jp">爆破瓶追加</span>
   </li>
   <li>
     <span class="name">Bleeding</span>
@@ -93,16 +85,16 @@
     <span class="name_jp">属性耐性</span>
   </li>
   <li>
-    <span class="name">Bomb Boost</span>
-    <span class="name_jp">爆弾強化</span>
+    <span class="name">Blunt Weapon</span>
+    <span class="name_jp">鈍器</span>
   </li>
   <li>
-    <span class="name">Brawn</span>
-    <span class="name_jp">剛腕</span>
+    <span class="name">Bomb Boost</span>
+    <span class="name_jp">爆弾強化</span>
   </li>
   <li>
-    <span class="name">Brutality</span>
-    <span class="name_jp">剛撃</span>
+    <span class="name">Bubbles</span>
+    <span class="name_jp">泡沫</span>
   </li>
   <li>
     <span class="name">C.Range C+</span>
@@ -116,6 +108,10 @@
     <span class="name">Carving</span>
     <span class="name_jp">剥ぎ取り</span>
   </li>
+  <li>
+    <span class="name">Chance</span>
+    <span class="name_jp">チャンス</span>
+  </li>
   <li>
     <span class="name">Charmer</span>
     <span class="name_jp">護石王</span>
@@ -128,6 +124,10 @@
     <span class="name">Cold Res</span>
     <span class="name_jp">耐寒</span>
   </li>
+  <li>
+    <span class="name">Cold-Adapted</span>
+    <span class="name_jp">寒冷適応</span>
+  </li>
   <li>
     <span class="name">Combo Plus</span>
     <span class="name_jp">調合数</span>
@@ -137,21 +137,21 @@
     <span class="name_jp">調合成功率</span>
   </li>
   <li>
-    <span class="name">Commander</span>
-    <span class="name_jp">指揮</span>
+    <span class="name">Combo Rush</span>
+    <span class="name_jp">連撃</span>
   </li>
   <li>
     <span class="name">Constitutn</span>
     <span class="name_jp">体術</span>
   </li>
-  <li>
-    <span class="name">Covert</span>
-    <span class="name_jp">裏稼業</span>
-  </li>
   <li>
     <span class="name">Crag S+</span>
     <span class="name_jp">榴弾追加</span>
   </li>
+  <li>
+    <span class="name">Crimson Helmet</span>
+    <span class="name_jp">紅兜</span>
+  </li>
   <li>
     <span class="name">Crit Draw</span>
     <span class="name_jp">抜刀会心</span>
@@ -165,8 +165,12 @@
     <span class="name_jp">特殊会心</span>
   </li>
   <li>
-    <span class="name">D. Fencing</span>
-    <span class="name_jp">北辰納豆流</span>
+    <span class="name">Critical Boost</span>
+    <span class="name_jp">会心強化</span>
+  </li>
+  <li>
+    <span class="name">Daruma</span>
+    <span class="name_jp">だるま</span>
   </li>
   <li>
     <span class="name">Dead Eye</span>
@@ -196,18 +200,14 @@
     <span class="name">Eating</span>
     <span class="name_jp">食事</span>
   </li>
-  <li>
-    <span class="name">Edge Lore</span>
-    <span class="name_jp">斬術</span>
-  </li>
-  <li>
-    <span class="name">Edgemaster</span>
-    <span class="name_jp">刀匠</span>
-  </li>
   <li>
     <span class="name">Elemental</span>
     <span class="name_jp">属性攻撃</span>
   </li>
+  <li>
+    <span class="name">Elemental Boost C+</span>
+    <span class="name_jp">属強瓶追加</span>
+  </li>
   <li>
     <span class="name">Evade Dist</span>
     <span class="name_jp">回避距離</span>
@@ -236,10 +236,6 @@
     <span class="name">Fencing</span>
     <span class="name_jp">剣術</span>
   </li>
-  <li>
-    <span class="name">Ferocity</span>
-    <span class="name_jp">一心</span>
-  </li>
   <li>
     <span class="name">Fire Atk</span>
     <span class="name_jp">火属性攻撃</span>
@@ -248,22 +244,10 @@
     <span class="name">Fire Res</span>
     <span class="name_jp">火耐性</span>
   </li>
-  <li>
-    <span class="name">Flame Aura</span>
-    <span class="name_jp">燃鱗</span>
-  </li>
-  <li>
-    <span class="name">FreeElemnt</span>
-    <span class="name_jp">属性解放</span>
-  </li>
   <li>
     <span class="name">Frenzy Res</span>
     <span class="name_jp">狂撃耐性</span>
   </li>
-  <li>
-    <span class="name">Fury</span>
-    <span class="name_jp">怒</span>
-  </li>
   <li>
     <span class="name">Gathering</span>
     <span class="name_jp">採取</span>
@@ -276,6 +260,10 @@
     <span class="name">Gluttony</span>
     <span class="name_jp">食いしん坊</span>
   </li>
+  <li>
+    <span class="name">Golden Thunder Prince</span>
+    <span class="name_jp">金雷公</span>
+  </li>
   <li>
     <span class="name">Guard</span>
     <span class="name_jp">ガード性能</span>
@@ -305,8 +293,24 @@
     <span class="name_jp">耐暑</span>
   </li>
   <li>
-    <span class="name">Hoarding</span>
-    <span class="name_jp">護石収集</span>
+    <span class="name">Heat-Adapted</span>
+    <span class="name_jp">炎熱適応</span>
+  </li>
+  <li>
+    <span class="name">Heavy Snow Lord</span>
+    <span class="name_jp">大雪主</span>
+  </li>
+  <li>
+    <span class="name">Heavy Up</span>
+    <span class="name_jp">重撃弾強化</span>
+  </li>
+  <li>
+    <span class="name">Herbology</span>
+    <span class="name_jp">野草知識</span>
+  </li>
+  <li>
+    <span class="name">Hero's Shield</span>
+    <span class="name_jp">英雄の盾</span>
   </li>
   <li>
     <span class="name">Honey</span>
@@ -324,14 +328,30 @@
     <span class="name">Ice Res</span>
     <span class="name_jp">氷耐性</span>
   </li>
+  <li>
+    <span class="name">Incinerating Blade</span>
+    <span class="name_jp">燼滅刃</span>
+  </li>
+  <li>
+    <span class="name">Irregular Shot</span>
+    <span class="name_jp">変則射撃</span>
+  </li>
   <li>
     <span class="name">KO</span>
     <span class="name_jp">KO</span>
   </li>
+  <li>
+    <span class="name">Kokoto</span>
+    <span class="name_jp">ココット</span>
+  </li>
   <li>
     <span class="name">LastingPwr</span>
     <span class="name_jp">効果持続</span>
   </li>
+  <li>
+    <span class="name">Leaping</span>
+    <span class="name_jp">跳躍</span>
+  </li>
   <li>
     <span class="name">LightEater</span>
     <span class="name_jp">節食</span>
@@ -341,29 +361,21 @@
     <span class="name_jp">装填数</span>
   </li>
   <li>
-    <span class="name">Maestro</span>
-    <span class="name_jp">笛</span>
+    <span class="name">Longing</span>
+    <span class="name_jp">無心</span>
   </li>
   <li>
-    <span class="name">Mechanic</span>
-    <span class="name_jp">職工</span>
+    <span class="name">Maestro</span>
+    <span class="name_jp">笛</span>
   </li>
   <li>
     <span class="name">Mounting</span>
     <span class="name_jp">乗り</span>
   </li>
-  <li>
-    <span class="name">Mud/Snow</span>
-    <span class="name_jp">耐泥耐雪</span>
-  </li>
   <li>
     <span class="name">Mycology</span>
     <span class="name_jp">茸食</span>
   </li>
-  <li>
-    <span class="name">Nimbleness</span>
-    <span class="name_jp">回避術</span>
-  </li>
   <li>
     <span class="name">Normal S+</span>
     <span class="name_jp">通常弾追加</span>
@@ -372,6 +384,10 @@
     <span class="name">Normal Up</span>
     <span class="name_jp">通常弾強化</span>
   </li>
+  <li>
+    <span class="name">One-Eyed</span>
+    <span class="name_jp">隻眼</span>
+  </li>
   <li>
     <span class="name">Para C+</span>
     <span class="name_jp">麻痺瓶追加</span>
@@ -409,20 +425,20 @@
     <span class="name_jp">毒瓶追加</span>
   </li>
   <li>
-    <span class="name">Potential</span>
-    <span class="name_jp">底力</span>
+    <span class="name">Pokke</span>
+    <span class="name_jp">ポッケ</span>
   </li>
   <li>
-    <span class="name">Power C+</span>
-    <span class="name_jp">強撃瓶追加</span>
+    <span class="name">Polisher</span>
+    <span class="name_jp">研磨術</span>
   </li>
   <li>
-    <span class="name">PowerEater</span>
-    <span class="name_jp">食欲</span>
+    <span class="name">Potential</span>
+    <span class="name_jp">底力</span>
   </li>
   <li>
-    <span class="name">Prayer</span>
-    <span class="name_jp">祈願</span>
+    <span class="name">Power C+</span>
+    <span class="name_jp">強撃瓶追加</span>
   </li>
   <li>
     <span class="name">Precision</span>
@@ -432,10 +448,6 @@
     <span class="name">Protection</span>
     <span class="name_jp">加護</span>
   </li>
-  <li>
-    <span class="name">Prudence</span>
-    <span class="name_jp">潔癖</span>
-  </li>
   <li>
     <span class="name">Psychic</span>
     <span class="name_jp">千里眼</span>
@@ -453,8 +465,8 @@
     <span class="name_jp">速射</span>
   </li>
   <li>
-    <span class="name">Readiness</span>
-    <span class="name_jp">居合</span>
+    <span class="name">Rebellious</span>
+    <span class="name_jp">逆上</span>
   </li>
   <li>
     <span class="name">Rec Level</span>
@@ -473,8 +485,12 @@
     <span class="name_jp">装填速度</span>
   </li>
   <li>
-    <span class="name">Resilience</span>
-    <span class="name_jp">頑強</span>
+    <span class="name">Rock Piercing</span>
+    <span class="name_jp">岩穿</span>
+  </li>
+  <li>
+    <span class="name">Ruinous Hook Claw</span>
+    <span class="name_jp">荒鉤爪</span>
   </li>
   <li>
     <span class="name">Sense</span>
@@ -501,12 +517,8 @@
     <span class="name_jp">睡眠瓶追加</span>
   </li>
   <li>
-    <span class="name">Slicing S+</span>
-    <span class="name_jp">斬裂弾追加</span>
-  </li>
-  <li>
-    <span class="name">Spd Gather</span>
-    <span class="name_jp">高速収集</span>
+    <span class="name">Spearbreaker</span>
+    <span class="name_jp">矛砕</span>
   </li>
   <li>
     <span class="name">SpeedSetup</span>
@@ -516,10 +528,6 @@
     <span class="name">Spirit</span>
     <span class="name_jp">闘魂</span>
   </li>
-  <li>
-    <span class="name">Stalwart</span>
-    <span class="name_jp">盾持</span>
-  </li>
   <li>
     <span class="name">Stam Drain</span>
     <span class="name_jp">減気攻撃</span>
@@ -536,18 +544,6 @@
     <span class="name">Status</span>
     <span class="name_jp">特殊攻撃</span>
   </li>
-  <li>
-    <span class="name">Status Res</span>
-    <span class="name_jp">状態耐性</span>
-  </li>
-  <li>
-    <span class="name">SteadyHand</span>
-    <span class="name_jp">射手</span>
-  </li>
-  <li>
-    <span class="name">Sticky Res</span>
-    <span class="name_jp">耐粘</span>
-  </li>
   <li>
     <span class="name">Stun</span>
     <span class="name_jp">気絶</span>
@@ -577,8 +573,8 @@
     <span class="name_jp">雷耐性</span>
   </li>
   <li>
-    <span class="name">Torso Up</span>
-    <span class="name_jp">胴系統倍加</span>
+    <span class="name">Tight Spot</span>
+    <span class="name_jp">窮地</span>
   </li>
   <li>
     <span class="name">Tranquilzr</span>
@@ -588,6 +584,10 @@
     <span class="name">Transportr</span>
     <span class="name_jp">運搬</span>
   </li>
+  <li>
+    <span class="name">Treasure Clad</span>
+    <span class="name_jp">宝纏</span>
+  </li>
   <li>
     <span class="name">Tremor Res</span>
     <span class="name_jp">耐震</span>
@@ -597,8 +597,8 @@
     <span class="name_jp">無傷</span>
   </li>
   <li>
-    <span class="name">Unshakable</span>
-    <span class="name_jp">不動</span>
+    <span class="name">Violet Poison Princess</span>
+    <span class="name_jp">紫毒姫</span>
   </li>
   <li>
     <span class="name">Water Atk</span>
@@ -612,6 +612,10 @@
     <span class="name">Whim</span>
     <span class="name_jp">気まぐれ</span>
   </li>
+  <li>
+    <span class="name">White Gale</span>
+    <span class="name_jp">白疾風</span>
+  </li>
   <li>
     <span class="name">Wide-Range</span>
     <span class="name_jp">広域</span>
@@ -620,6 +624,10 @@
     <span class="name">Wind Res</span>
     <span class="name_jp">風圧</span>
   </li>
+  <li>
+    <span class="name">Yukumo</span>
+    <span class="name_jp">ユクモ</span>
+  </li>
 </ul>
 </div>
 </div>