Merge branch 'drgoonic-otherchange'

brasstax · Nov 14, 2018 · 5720939 · 5720939
2 parents 0618699 + afc5a6b
commit 5720939
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/commands/ffrk/otherLookup.js b/commands/ffrk/otherLookup.js
@@ -19,7 +19,7 @@ module.exports = class ReplyCommand extends Command {
           type: 'string',
         },
       ],
-      aliases: ['o'],
+      aliases: ['o', 'chase'],
     });
   }
 

diff --git a/utilities/aliases.json b/utilities/aliases.json
@@ -5,12 +5,14 @@
   "cod": "Cloud of Darkness",
   "ok": "Onion Knight",
   "onion": "Onion Knight",
+  "war": "Warrior of Light",
   "raines": "Cid Raines",
   "gladio": "Gladiolus",
   "greg": "Gilgamesh",
   "jihl": "Nabaat",
   "keeper": "Tyro",
   "aeris": "Aerith",
+  "tgc": "Orlandeau",
   "orlandu": "Orlandeau",
   "gogo5": "Gogo (V)",
   "gogo6": "Gogo (VI)",
@@ -39,6 +41,7 @@
   "cait": "Cait Sith",
   "sith": "Cait Sith",
   "red": "Red XIII",
+  "red13": "Red XIII",
   "drmog": "Dr. Mog",
   "doctor": "Dr. Mog",
   "mog6": "Mog"

diff --git a/utilities/other-spreadsheet-bot-utils.js b/utilities/other-spreadsheet-bot-utils.js
@@ -69,22 +69,20 @@ function sendRichEmbedOther(result, msg) {
     let description = (entry.effects !== undefined) ?
       (entry.effects) : (botUtils.returnDefaultDuration(entry));
     let name = entry.name;
-    let sb = (entry.sb !== undefined) ?
-      (entry.sb) : (0);
-    let time = (entry.time !== undefined) ?
-      (entry.time) : ('N/A');
     let multiplier = (entry.multiplier !== undefined) ?
       (botUtils.returnMultiplier(entry)) : ('N/A');
     let source = entry.source;
     let target = entry.target;
+	let element = entry.element;
+	let school = entry.school;
     let embed = new RichEmbed()
       .setTitle(name)
       .setDescription(description)
       .setColor('#bfdaff')
       .addField('Source', source, true)
       .addField('Target', target, true)
-      .addField('Cast time', time)
-      .addField('Soul Break charge', sb, true)
+      .addField('Element', element)
+	  .addField('School', school, true)
       .addField('Multiplier', multiplier, true);
     msg.channel.send({embed})
       .then( (resolve) => {