Merge branch 'elninofr-patch-1'

runbot.sh

@@ -1,3 +1,4 @@
+cd "$(dirname "$0")"
 until /usr/bin/node ffrkbot.js; do
   echo "FFRKBot crashed with an exit code $?. Respawning..." >&2
   sleep 1

update-json.sh

@@ -1,9 +1,18 @@
 #!/bin/bash
+cd "$(dirname "$0")"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Record Materia" -b enlir_json/recordMateria.json
+echo "RM done"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Soul Breaks" -b enlir_json/soulbreaks.json
+echo "SB done"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Status" -b enlir_json/status.json
+echo "status done"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Abilities" -b enlir_json/abilities.json
+echo "ability done"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Brave" -b enlir_json/braveCommands.json
+echo "brave done"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Burst" -b enlir_json/bsbCommands.json
+echo "bsb cmd done"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Legend Materia" -b enlir_json/legendMateria.json
+echo "LM done"
 gsjson 1f8OJIQhpycljDQ8QNDk_va1GJ1u7RVoMaNjFcHH0LKk -w "Other" -b enlir_json/other.json
+echo "All done"

utilities/aliases.json

@@ -44,5 +44,37 @@
   "red13": "Red XIII",
   "drmog": "Dr. Mog",
   "doctor": "Dr. Mog",
-  "mog6": "Mog"
+  "thief1": "Thief (I)",
+  "thief0": "Thief (Core)",
+  "mog6": "Mog",
+  "fif": "Thief (I)",
+  "gombrz": "Golbez",
+  "seifzr": "Seifer",
+  "kisskiss": "Quistis",
+  "limahro": "Kimahri",
+  "scoll": "Squall",
+  "pzin": "Paine",
+  "hautefourchette": "Haurchefant",
+  "barriton": "Barret",
+  "pectomulo": "Sephiroth",
+  "oulala": "Elarra",
+  "npc": "Firion",
+  "Clown": "Sora",
+  "iyeyui": "Yuna",
+  "pzin": "Paine",
+  "potato": "Papalymo",
+  "daron": "Jecht",
+  "laguno": "Laguna",
+  "scrub": "Cloud",
+  "cloute": "Cloud",
+  "clodo": "Cloud",
+  "zizou": "Zidane",
+  "sinj": "Zidane",
+  "rat": "Freya",
+  "allemand": "Steiner",
+  "penelope": "Penelo",
+  "choco": "Sazh",
+  "chocolato": "Sazh",
+  "sankouid": "Thancred",
+  "ramzo": "Ramza"
 }

utilities/soulbreak-bot-utils.js

@@ -62,7 +62,7 @@ function searchSoulbreak(character, sbType='all') {
       if (sbType.toLowerCase() !== 'all') {
         let dataset = result.value;
         sbType = escapeStringRegexp(sbType);
-        let tierQueryString = util.format('[*tier~/^%s$/i]', sbType);
+        let tierQueryString = util.format('[*tier~/^%s/i]', sbType);
         console.log(`tierQueryString: ${tierQueryString}`);
         result = jsonQuery(tierQueryString, {
           data: dataset,
@@ -85,7 +85,7 @@ function searchSoulbreak(character, sbType='all') {
  **/
 function checkSoulbreakFilter(sbType) {
   let possibleSbTypes = ['all', 'default', 'sb', 'ssb',
-    'bsb', 'usb', 'osb', 'csb', 'fsb', 'uosb', 'aosb', 'aasb', 'glint'];
+    'bsb', 'usb', 'osb', 'csb', 'fsb', 'uosb', 'aosb', 'aasb', 'glint', 'glint+'];
   if (possibleSbTypes.indexOf(sbType.toLowerCase()) === -1) {
     return false;
   } else {