@lotus-tree/fg-notation 1.1.4 → 1.2.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/README.md CHANGED
@@ -23,20 +23,21 @@ https://user-images.githubusercontent.com/19596334/149458504-baf906a3-87da-4d92-
23
23
  https://user-images.githubusercontent.com/19596334/149458508-1dcf89fb-a83e-44bb-a6a0-9549771c6082.mp4
24
24
 
25
25
  ## Available games
26
- | Game | Name |
27
- |---------------------|------|
28
- | Blazblue | bb |
29
- | Dragonball Fighterz | dbz |
30
- | DNF Duel | dnf |
31
- | Granblue Versus | gbf |
32
- | Guilty Gear | gg |
33
- | King of Fighters | kof |
34
- | Mortal Kombat | mk |
35
- | Soul Calibur | sc |
36
- | Street Fighter | sf |
37
- | Skullgirlz | sg |
38
- | Them Fighting Herds | tfh |
39
- | Tekken | tkn |
26
+ | Game | Name |
27
+ |----------------------------|-------|
28
+ | Blazblue | bb |
29
+ | Blazblue: Cross Tag Battle | bbtag |
30
+ | Dragonball Fighterz | dbz |
31
+ | DNF Duel | dnf |
32
+ | Granblue Versus | gbf |
33
+ | Guilty Gear | gg |
34
+ | King of Fighters | kof |
35
+ | Mortal Kombat | mk |
36
+ | Soul Calibur | sc |
37
+ | Street Fighter | sf |
38
+ | Skullgirlz | sg |
39
+ | Them Fighting Herds | tfh |
40
+ | Tekken | tkn |
40
41
 
41
42
  ## Add to your server
42
43
  Use [this link](https://discord.com/oauth2/authorize?client_id=928539052834177024&scope=bot&permissions=34816) to add this bot to your Discord server
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
package/dev/index.js CHANGED
@@ -9,10 +9,10 @@ exports["default"] = void 0;
9
9
 
10
10
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
11
 
12
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
-
14
12
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
15
13
 
14
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
+
16
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
17
 
18
18
  var _sharp = _interopRequireDefault(require("sharp"));
@@ -25,6 +25,8 @@ var _sequelize = require("sequelize");
25
25
 
26
26
  var _bent = _interopRequireDefault(require("bent"));
27
27
 
28
+ var _info = require("./info.json");
29
+
28
30
  var getJSON = (0, _bent["default"])('json');
29
31
 
30
32
  var imgPath = _path["default"].join(__dirname, 'img');
@@ -77,27 +79,55 @@ _glob["default"].sync(_path["default"].join(imgPath, 'basic/**'), {
77
79
  }).forEach(function (p) {
78
80
  var input = p.split('/').pop().replace('.png', '');
79
81
  basicInputs.set(input, p);
80
- });
82
+ var alias = _info.aliases.inputs.basic[input];
81
83
 
82
- basicInputs.set('>>', _path["default"].join(imgPath, 'basic/doubleforward.png'));
84
+ if (alias) {
85
+ alias.forEach(function (i) {
86
+ basicInputs.set(i, p);
87
+ if (_info.sizes[input]) _info.sizes[i] = _info.sizes[input];
88
+ });
89
+ }
90
+ });
83
91
 
84
- _glob["default"].sync(_path["default"].join(imgPath, 'games/**'), {
85
- nodir: true
86
- }).forEach(function (p) {
92
+ _glob["default"].sync(_path["default"].join(imgPath, 'games/*')).forEach(function (p) {
87
93
  var _path$parse = _path["default"].parse(_path["default"].relative(_path["default"].join(imgPath, 'games'), p)),
88
- dir = _path$parse.dir,
89
- name = _path$parse.name;
94
+ base = _path$parse.base;
95
+
96
+ gameInputs.set(base, new Map());
90
97
 
91
- if (!gameInputs.has(dir)) gameInputs.set(dir, new Map());
92
- gameInputs.get(dir).set(name, p);
98
+ _glob["default"].sync(_path["default"].join(imgPath, 'games', base, '**'), {
99
+ nodir: true
100
+ }).forEach(function (input) {
101
+ var _path$parse2 = _path["default"].parse(input),
102
+ name = _path$parse2.name;
103
+
104
+ gameInputs.get(base).set(name, input);
105
+ });
106
+
107
+ var alias = _info.aliases.inputs.games[base];
108
+
109
+ if (alias) {
110
+ for (var _i = 0, _Object$entries = Object.entries(alias); _i < _Object$entries.length; _i++) {
111
+ var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
112
+ a = _Object$entries$_i[0],
113
+ s = _Object$entries$_i[1];
114
+
115
+ gameInputs.get(base).set(a, s);
116
+ }
117
+ }
93
118
  });
94
119
 
95
120
  function solveInput(inputs, input) {
96
- if (inputs.has(input)) return [input];
121
+ if (inputs.has(input)) return isString(inputs.get(input)) ? [input] : inputs.get(input);
97
122
 
98
123
  for (var i = 0; i < input.length; i++) {
99
124
  var s1 = input.slice(0, 0 - i);
100
- if (inputs.has(s1)) return [s1].concat((0, _toConsumableArray2["default"])(solveInput(inputs, input.slice(0 - i))));
125
+
126
+ if (inputs.has(s1)) {
127
+ var result = inputs.get(s1);
128
+ var remaining = solveInput(inputs, input.slice(0 - i));
129
+ return isString(result) ? [s1].concat((0, _toConsumableArray2["default"])(remaining)) : [].concat((0, _toConsumableArray2["default"])(result), (0, _toConsumableArray2["default"])(remaining));
130
+ }
101
131
  }
102
132
 
103
133
  throw new Error("Cannot find \"".concat(input, "\" as a recognizable input"));
@@ -109,37 +139,61 @@ function sendInput(_x, _x2, _x3, _x4) {
109
139
 
110
140
  function _sendInput() {
111
141
  _sendInput = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(inputs, result, message, caption) {
112
- var canvas;
142
+ var width, images, left, canvas;
113
143
  return _regenerator["default"].wrap(function _callee7$(_context7) {
114
144
  while (1) {
115
145
  switch (_context7.prev = _context7.next) {
116
146
  case 0:
117
- _context7.next = 2;
118
- return (0, _sharp["default"])({
147
+ width = result.map(function (it) {
148
+ return _info.sizes[it] || 152;
149
+ }).reduce(function (a, b) {
150
+ return a + b;
151
+ }, 0);
152
+ images = [];
153
+ left = 0;
154
+ result.forEach(function (it, index) {
155
+ var size = _info.sizes[it] || 152;
156
+ images.push({
157
+ input: inputs.get(it),
158
+ left: left,
159
+ top: Math.floor((152 - size) / 2)
160
+ });
161
+ left += size;
162
+ });
163
+ canvas = (0, _sharp["default"])({
119
164
  create: {
120
- width: 152 * result.length,
165
+ width: width,
121
166
  height: 152,
122
167
  channels: 4,
123
168
  background: 'transparent'
124
169
  }
125
- }).composite(result.map(function (it, index) {
126
- return {
127
- input: inputs.get(it),
128
- left: index * 152,
129
- top: 0,
130
- width: 152,
131
- height: 152
132
- };
133
- })).png().toBuffer();
170
+ }).png().composite(images);
171
+ _context7.next = 7;
172
+ return canvas.toBuffer();
134
173
 
135
- case 2:
174
+ case 7:
136
175
  canvas = _context7.sent;
176
+
177
+ if (!(result.length < 12)) {
178
+ _context7.next = 12;
179
+ break;
180
+ }
181
+
182
+ _context7.next = 11;
183
+ return (0, _sharp["default"])(canvas).resize({
184
+ height: 55
185
+ }).png().toBuffer();
186
+
187
+ case 11:
188
+ canvas = _context7.sent;
189
+
190
+ case 12:
137
191
  return _context7.abrupt("return", message.reply({
138
192
  content: caption,
139
193
  files: [canvas]
140
194
  }));
141
195
 
142
- case 4:
196
+ case 13:
143
197
  case "end":
144
198
  return _context7.stop();
145
199
  }
@@ -149,13 +203,14 @@ function _sendInput() {
149
203
  return _sendInput.apply(this, arguments);
150
204
  }
151
205
 
152
- var builtin = {
153
- 37: {
154
- game: 'sf',
155
- caption: '***LETS GO JUSTIN!***',
156
- input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk'
157
- }
158
- };
206
+ function checkGame(game) {
207
+ return gameInputs.has(game) ? game : _info.aliases.games[game];
208
+ }
209
+
210
+ function isString(x) {
211
+ return Object.prototype.toString.call(x) === '[object String]';
212
+ }
213
+
159
214
  var _default = {
160
215
  name: 'fg-notation',
161
216
  about: {
@@ -207,7 +262,7 @@ var _default = {
207
262
  }
208
263
 
209
264
  name = message.content.split(' ').pop().replace(prefix, '');
210
- _context.t0 = builtin[name];
265
+ _context.t0 = _info.builtin[name];
211
266
 
212
267
  if (_context.t0) {
213
268
  _context.next = 12;
@@ -249,7 +304,7 @@ var _default = {
249
304
  example: 'fgi sf 236P 214K',
250
305
  execute: function () {
251
306
  var _execute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref, _ref2) {
252
- var param, message, _param, game, i1, inputs, result;
307
+ var param, message, _param, gameInput, i1, game, inputs, result;
253
308
 
254
309
  return _regenerator["default"].wrap(function _callee2$(_context2) {
255
310
  while (1) {
@@ -257,9 +312,9 @@ var _default = {
257
312
  case 0:
258
313
  param = _ref.param;
259
314
  message = _ref2.message;
260
- _param = (0, _slicedToArray2["default"])(param, 3), game = _param[1], i1 = _param[2];
315
+ _param = (0, _slicedToArray2["default"])(param, 3), gameInput = _param[1], i1 = _param[2];
261
316
 
262
- if (!(!game || !i1)) {
317
+ if (!(!gameInput || !i1)) {
263
318
  _context2.next = 5;
264
319
  break;
265
320
  }
@@ -267,21 +322,27 @@ var _default = {
267
322
  return _context2.abrupt("return", message.reply('Missing arguments. Example: >fgi sf 236P 214K'));
268
323
 
269
324
  case 5:
325
+ game = checkGame(gameInput);
326
+
270
327
  if (gameInputs.has(game)) {
271
- _context2.next = 7;
328
+ _context2.next = 8;
272
329
  break;
273
330
  }
274
331
 
275
332
  return _context2.abrupt("return", message.reply("\"".concat(game, "\" is not a valid game. Available games: ").concat(Array.from(gameInputs.keys()).join(' '))));
276
333
 
277
- case 7:
278
- inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
279
- result = param.slice(2).map(function (i) {
280
- return solveInput(inputs, i.toLowerCase());
281
- }).flat();
282
- sendInput(inputs, result, message);
334
+ case 8:
335
+ try {
336
+ inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
337
+ result = param.slice(2).map(function (i) {
338
+ return solveInput(inputs, i.toLowerCase());
339
+ }).flat();
340
+ sendInput(inputs, result, message);
341
+ } catch (err) {
342
+ message.reply(err.message);
343
+ }
283
344
 
284
- case 10:
345
+ case 9:
285
346
  case "end":
286
347
  return _context2.stop();
287
348
  }
@@ -302,7 +363,7 @@ var _default = {
302
363
  example: 'fgi sf testName 236P 214K',
303
364
  execute: function () {
304
365
  var _execute2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref3, _ref4) {
305
- var param, sequelize, message, _param2, game, name, i1, inputs, input;
366
+ var param, sequelize, message, _param2, gameInput, name, i1, game, inputs, input;
306
367
 
307
368
  return _regenerator["default"].wrap(function _callee3$(_context3) {
308
369
  while (1) {
@@ -310,9 +371,9 @@ var _default = {
310
371
  case 0:
311
372
  param = _ref3.param, sequelize = _ref3.sequelize;
312
373
  message = _ref4.message;
313
- _param2 = (0, _slicedToArray2["default"])(param, 4), game = _param2[1], name = _param2[2], i1 = _param2[3];
374
+ _param2 = (0, _slicedToArray2["default"])(param, 4), gameInput = _param2[1], name = _param2[2], i1 = _param2[3];
314
375
 
315
- if (!(!game || !name || !i1)) {
376
+ if (!(!gameInput || !name || !i1)) {
316
377
  _context3.next = 5;
317
378
  break;
318
379
  }
@@ -320,19 +381,22 @@ var _default = {
320
381
  return _context3.abrupt("return", message.reply('Missing arguments. Example: >fgi sf testName 236P 214K'));
321
382
 
322
383
  case 5:
384
+ game = checkGame(gameInput);
385
+
323
386
  if (gameInputs.has(game)) {
324
- _context3.next = 7;
387
+ _context3.next = 8;
325
388
  break;
326
389
  }
327
390
 
328
391
  return _context3.abrupt("return", message.reply("\"".concat(game, "\" is not a valid game. Available games: ").concat(Array.from(gameInputs.keys()).join(' '))));
329
392
 
330
- case 7:
393
+ case 8:
394
+ _context3.prev = 8;
331
395
  inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
332
396
  input = param.slice(3).map(function (i) {
333
397
  return solveInput(inputs, i.toLowerCase());
334
398
  }).flat().join(' ');
335
- _context3.next = 11;
399
+ _context3.next = 13;
336
400
  return sequelize.models.fginput.create({
337
401
  guild: message.guild.id,
338
402
  name: name,
@@ -341,15 +405,22 @@ var _default = {
341
405
  input: input
342
406
  });
343
407
 
344
- case 11:
408
+ case 13:
345
409
  message.channel.send("Saved command \"".concat(input, "\" as \"").concat(name, "\""));
410
+ _context3.next = 19;
411
+ break;
346
412
 
347
- case 12:
413
+ case 16:
414
+ _context3.prev = 16;
415
+ _context3.t0 = _context3["catch"](8);
416
+ message.reply(_context3.t0.message);
417
+
418
+ case 19:
348
419
  case "end":
349
420
  return _context3.stop();
350
421
  }
351
422
  }
352
- }, _callee3);
423
+ }, _callee3, null, [[8, 16]]);
353
424
  }));
354
425
 
355
426
  function execute(_x7, _x8) {
@@ -488,4 +559,5 @@ var _default = {
488
559
  }
489
560
  }
490
561
  };
491
- exports["default"] = _default;
562
+ exports["default"] = _default;
563
+ //# sourceMappingURL=data:application/json;charset=utf-8;base64,{"version":3,"sources":["../src/index.js"],"names":["getJSON","imgPath","path","join","__dirname","basicInputs","Map","gameInputs","glossary","terms","getGlossary","setInterval","result","tempG","tempT","forEach","i","term","toLowerCase","push","glob","sync","nodir","p","input","split","pop","replace","set","alias","aliases","inputs","basic","sizes","parse","relative","base","name","get","games","Object","entries","a","s","solveInput","has","isString","length","s1","slice","remaining","Error","sendInput","message","caption","width","map","it","reduce","b","images","left","index","size","top","Math","floor","canvas","create","height","channels","background","png","composite","toBuffer","resize","reply","content","files","checkGame","game","x","prototype","toString","call","about","value","intents","partials","preload","sequelize","define","guild","type","DataTypes","STRING","primaryKey","createdBy","events","messageCreate","global","client","config","author","id","user","member","guildId","prefix","startsWith","builtin","models","fginput","findOne","where","row","commands","fgi","usage","desc","example","execute","param","gameInput","i1","Array","from","keys","flat","err","fgsave","channel","send","fgcaption","save","fgglossary","params","search","filter","includes","url","def"],"mappings":"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","sourcesContent":["import sharp from 'sharp'\r\nimport path from 'path'\r\nimport glob from 'glob'\r\nimport { DataTypes } from 'sequelize'\r\nimport bent from 'bent'\r\n\r\nimport { sizes, aliases, builtin } from './info.json'\r\n\r\nconst getJSON = bent('json')\r\nconst imgPath = path.join(__dirname, 'img')\r\nconst basicInputs = new Map()\r\nconst gameInputs = new Map()\r\n\r\nlet glossary = {}\r\nlet terms = []\r\n\r\ngetGlossary()\r\nsetInterval(getGlossary, 5 * 60 * 1000)\r\n\r\nasync function getGlossary () {\r\n  const result = await getJSON('https://glossary.infil.net/json/glossary.json')\r\n  const tempG = {}\r\n  const tempT = []\r\n\r\n  result.forEach(i => {\r\n    const term = i.term.toLowerCase()\r\n    tempG[term] = i\r\n    tempT.push(term)\r\n  })\r\n\r\n  glossary = tempG\r\n  terms = tempT\r\n}\r\n\r\nglob.sync(path.join(imgPath, 'basic/**'), { nodir: true })\r\n  .forEach(p => {\r\n    const input = p.split('/').pop().replace('.png', '')\r\n    basicInputs.set(input, p)\r\n\r\n    const alias = aliases.inputs.basic[input]\r\n    if (alias) {\r\n      alias.forEach(i => {\r\n        basicInputs.set(i, p)\r\n        if (sizes[input]) sizes[i] = sizes[input]\r\n      })\r\n    }\r\n  })\r\n\r\nglob.sync(path.join(imgPath, 'games/*'))\r\n  .forEach(p => {\r\n    const { base } = path.parse(path.relative(path.join(imgPath, 'games'), p))\r\n    gameInputs.set(base, new Map())\r\n\r\n    glob.sync(path.join(imgPath, 'games', base, '**'), { nodir: true })\r\n      .forEach(input => {\r\n        const { name } = path.parse(input)\r\n        gameInputs.get(base).set(name, input)\r\n      })\r\n\r\n    const alias = aliases.inputs.games[base]\r\n\r\n    if (alias) {\r\n      for (const [a, s] of Object.entries(alias)) {\r\n        gameInputs.get(base).set(a, s)\r\n      }\r\n    }\r\n  })\r\n\r\nfunction solveInput (inputs, input) {\r\n  if (inputs.has(input)) return isString(inputs.get(input)) ? [input] : inputs.get(input)\r\n\r\n  for (let i = 0; i < input.length; i++) {\r\n    const s1 = input.slice(0, 0 - i)\r\n\r\n    if (inputs.has(s1)) {\r\n      const result = inputs.get(s1)\r\n      const remaining = solveInput(inputs, input.slice(0 - i))\r\n\r\n      return isString(result) ? [s1, ...remaining] : [...result, ...remaining]\r\n    }\r\n  }\r\n\r\n  throw new Error(`Cannot find \"${input}\" as a recognizable input`)\r\n}\r\n\r\nasync function sendInput (inputs, result, message, caption) {\r\n  const width = result.map(it => sizes[it] || 152).reduce((a, b) => a + b, 0)\r\n  const images = []\r\n  let left = 0\r\n\r\n  result.forEach((it, index) => {\r\n    const size = sizes[it] || 152\r\n    images.push({ input: inputs.get(it), left, top: Math.floor((152 - size) / 2) })\r\n    left += size\r\n  })\r\n\r\n  let canvas = sharp({ create: { width, height: 152, channels: 4, background: 'transparent' } })\r\n    .png()\r\n    .composite(images)\r\n\r\n  canvas = await canvas.toBuffer()\r\n\r\n  if (result.length < 12) canvas = await sharp(canvas).resize({ height: 55 }).png().toBuffer()\r\n\r\n  return message.reply({ content: caption, files: [canvas] })\r\n}\r\n\r\nfunction checkGame (game) {\r\n  return gameInputs.has(game) ? game : aliases.games[game]\r\n}\r\n\r\nfunction isString (x) {\r\n  return Object.prototype.toString.call(x) === '[object String]'\r\n}\r\n\r\nexport default {\r\n  name: 'fg-notation',\r\n  about: {\r\n    name: 'FG Notation',\r\n    value: '[Instructions and source code](https://lotus.chitowarlock.com/fgnotation)\\n[Infil\\'s Fighting Game Glossary](https://glossary.infil.net)\\n[MagicianStuff\\'s Fighthing Game notations emotes](https://twitter.com/MagicianStuff/status/1477931054484893697)'\r\n  },\r\n  intents: ['GUILD_MESSAGES'],\r\n  partials: ['MESSAGE'],\r\n\r\n  preload: sequelize => {\r\n    sequelize.define('fginput', {\r\n      guild: {\r\n        type: DataTypes.STRING,\r\n        primaryKey: true\r\n      },\r\n      name: {\r\n        type: DataTypes.STRING,\r\n        primaryKey: true\r\n      },\r\n      createdBy: DataTypes.STRING,\r\n      game: DataTypes.STRING,\r\n      caption: DataTypes.STRING,\r\n      input: DataTypes.STRING\r\n    })\r\n  },\r\n\r\n  events: {\r\n    async messageCreate (global, message) {\r\n      const { client, config, sequelize } = global\r\n      if (message.author.id === client.user.id || !message.member) return\r\n\r\n      const guildId = message.guildId\r\n      const { prefix } = config[guildId]\r\n\r\n      if (message.content.startsWith(prefix)) {\r\n        const name = message.content.split(' ').pop().replace(prefix, '')\r\n        const row = builtin[name] || (\r\n          await sequelize.models.fginput.findOne({\r\n            where: { guild: message.guild.id, name }\r\n          })\r\n        )\r\n\r\n        if (row) {\r\n          const inputs = new Map([...basicInputs, ...gameInputs.get(row.game)])\r\n          sendInput(inputs, row.input.split(' '), message, row.caption)\r\n        }\r\n      }\r\n    }\r\n  },\r\n\r\n  commands: {\r\n    fgi: {\r\n      usage: 'fgi [game] [inputs]',\r\n      desc: 'Converts a list of inputs into an image',\r\n      example: 'fgi sf 236P 214K',\r\n      execute: async ({ param }, { message }) => {\r\n        const [, gameInput, i1] = param\r\n        if (!gameInput || !i1) return message.reply('Missing arguments. Example: >fgi sf 236P 214K')\r\n\r\n        const game = checkGame(gameInput)\r\n        if (!gameInputs.has(game)) return message.reply(`\"${game}\" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)\r\n\r\n        try {\r\n          const inputs = new Map([...basicInputs, ...gameInputs.get(game)])\r\n          const result = param.slice(2).map(i => solveInput(inputs, i.toLowerCase())).flat()\r\n\r\n          sendInput(inputs, result, message)\r\n        } catch (err) {\r\n          message.reply(err.message)\r\n        }\r\n      }\r\n    },\r\n    fgsave: {\r\n      usage: 'fgsave [game] [name] [inputs]',\r\n      desc: 'Saves a list of inputs into a command',\r\n      example: 'fgi sf testName 236P 214K',\r\n      execute: async ({ param, sequelize }, { message }) => {\r\n        const [, gameInput, name, i1] = param\r\n        if (!gameInput || !name || !i1) return message.reply('Missing arguments. Example: >fgi sf testName 236P 214K')\r\n\r\n        const game = checkGame(gameInput)\r\n        if (!gameInputs.has(game)) return message.reply(`\"${game}\" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)\r\n\r\n        try {\r\n          const inputs = new Map([...basicInputs, ...gameInputs.get(game)])\r\n          const input = param.slice(3).map(i => solveInput(inputs, i.toLowerCase())).flat().join(' ')\r\n\r\n          await sequelize.models.fginput.create({ guild: message.guild.id, name, createdBy: message.author.id, game, input })\r\n\r\n          message.channel.send(`Saved command \"${input}\" as \"${name}\"`)\r\n        } catch (err) {\r\n          message.reply(err.message)\r\n        }\r\n      }\r\n    },\r\n    fgcaption: {\r\n      usage: 'fgcaption [name] [caption]',\r\n      desc: 'Adds a caption to a saved input command',\r\n      example: 'fgcaption testName This is a caption',\r\n      execute: async ({ param, sequelize }, { message }) => {\r\n        const [, name, i1] = param\r\n        if (!name || !i1) return message.reply('Missing arguments. Example: >fgi testName This is a caption')\r\n\r\n        const row = await sequelize.models.fginput.findOne({\r\n          where: { guild: message.guild.id, name }\r\n        })\r\n\r\n        if (!row) return message.reply(`\"${name}\" is not a saved input list`)\r\n        row.caption = param.slice(2).join(' ')\r\n        await row.save()\r\n\r\n        message.channel.send(`Saved caption for input list \"${name}\"`)\r\n      }\r\n    },\r\n    fgglossary: {\r\n      usage: 'fgglossary [search term]',\r\n      desc: 'Searches for a term on Infil\\'s Glossary',\r\n      example: 'fgglossary mexican uppercut',\r\n      execute: async ({ param, sequelize }, { message }) => {\r\n        const params = param.slice(1)\r\n        if (params.length === 0) return message.reply('Missing search term. Example: >fgglossary mexican uppercut')\r\n\r\n        const search = params.join(' ').toLowerCase()\r\n        const result = terms.filter(i => i.includes(search))\r\n        const url = `https://glossary.infil.net/?t=${params.join('%20').toLowerCase()}`\r\n\r\n        if (result.length === 0) return message.reply(`Term \"${search}\" not found`)\r\n        if (result.length === 1) return message.reply(`\\`\\`\\`${glossary[result[0]].def}\\`\\`\\`Source: <${url}>`)\r\n\r\n        message.reply(`Multiple terms found: ${url}`)\r\n      }\r\n    }\r\n  }\r\n}\r\n"]}
package/dev/info.json ADDED
@@ -0,0 +1,33 @@
1
+ {
2
+ "sizes": { "+": 55 },
3
+
4
+ "builtin": {
5
+ "37": {
6
+ "game": "sf",
7
+ "caption": "***LETS GO JUSTIN!***",
8
+ "input": "6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk"
9
+ }
10
+ },
11
+
12
+ "aliases": {
13
+ "games": {
14
+ "bbt": "bbtag",
15
+ "db": "dbz"
16
+ },
17
+
18
+ "inputs": {
19
+ "basic": {
20
+ "doubleforward": [">>"]
21
+ },
22
+
23
+ "games": {
24
+ "bbtag": {
25
+ "throw": ["b","+","c"],
26
+ "crb": ["d","+","p"],
27
+ "airdash": ["a","+","b"],
28
+ "reversal": ["a","+","d"]
29
+ }
30
+ }
31
+ }
32
+ }
33
+ }
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
package/lib/index.js CHANGED
@@ -9,10 +9,10 @@ exports["default"] = void 0;
9
9
 
10
10
  var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
11
11
 
12
- var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
13
-
14
12
  var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
15
13
 
14
+ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
15
+
16
16
  var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
17
17
 
18
18
  var _sharp = _interopRequireDefault(require("sharp"));
@@ -25,6 +25,8 @@ var _sequelize = require("sequelize");
25
25
 
26
26
  var _bent = _interopRequireDefault(require("bent"));
27
27
 
28
+ var _info = require("./info.json");
29
+
28
30
  var getJSON = (0, _bent["default"])('json');
29
31
 
30
32
  var imgPath = _path["default"].join(__dirname, 'img');
@@ -77,27 +79,55 @@ _glob["default"].sync(_path["default"].join(imgPath, 'basic/**'), {
77
79
  }).forEach(function (p) {
78
80
  var input = p.split('/').pop().replace('.png', '');
79
81
  basicInputs.set(input, p);
80
- });
82
+ var alias = _info.aliases.inputs.basic[input];
81
83
 
82
- basicInputs.set('>>', _path["default"].join(imgPath, 'basic/doubleforward.png'));
84
+ if (alias) {
85
+ alias.forEach(function (i) {
86
+ basicInputs.set(i, p);
87
+ if (_info.sizes[input]) _info.sizes[i] = _info.sizes[input];
88
+ });
89
+ }
90
+ });
83
91
 
84
- _glob["default"].sync(_path["default"].join(imgPath, 'games/**'), {
85
- nodir: true
86
- }).forEach(function (p) {
92
+ _glob["default"].sync(_path["default"].join(imgPath, 'games/*')).forEach(function (p) {
87
93
  var _path$parse = _path["default"].parse(_path["default"].relative(_path["default"].join(imgPath, 'games'), p)),
88
- dir = _path$parse.dir,
89
- name = _path$parse.name;
94
+ base = _path$parse.base;
95
+
96
+ gameInputs.set(base, new Map());
90
97
 
91
- if (!gameInputs.has(dir)) gameInputs.set(dir, new Map());
92
- gameInputs.get(dir).set(name, p);
98
+ _glob["default"].sync(_path["default"].join(imgPath, 'games', base, '**'), {
99
+ nodir: true
100
+ }).forEach(function (input) {
101
+ var _path$parse2 = _path["default"].parse(input),
102
+ name = _path$parse2.name;
103
+
104
+ gameInputs.get(base).set(name, input);
105
+ });
106
+
107
+ var alias = _info.aliases.inputs.games[base];
108
+
109
+ if (alias) {
110
+ for (var _i = 0, _Object$entries = Object.entries(alias); _i < _Object$entries.length; _i++) {
111
+ var _Object$entries$_i = (0, _slicedToArray2["default"])(_Object$entries[_i], 2),
112
+ a = _Object$entries$_i[0],
113
+ s = _Object$entries$_i[1];
114
+
115
+ gameInputs.get(base).set(a, s);
116
+ }
117
+ }
93
118
  });
94
119
 
95
120
  function solveInput(inputs, input) {
96
- if (inputs.has(input)) return [input];
121
+ if (inputs.has(input)) return isString(inputs.get(input)) ? [input] : inputs.get(input);
97
122
 
98
123
  for (var i = 0; i < input.length; i++) {
99
124
  var s1 = input.slice(0, 0 - i);
100
- if (inputs.has(s1)) return [s1].concat((0, _toConsumableArray2["default"])(solveInput(inputs, input.slice(0 - i))));
125
+
126
+ if (inputs.has(s1)) {
127
+ var result = inputs.get(s1);
128
+ var remaining = solveInput(inputs, input.slice(0 - i));
129
+ return isString(result) ? [s1].concat((0, _toConsumableArray2["default"])(remaining)) : [].concat((0, _toConsumableArray2["default"])(result), (0, _toConsumableArray2["default"])(remaining));
130
+ }
101
131
  }
102
132
 
103
133
  throw new Error("Cannot find \"".concat(input, "\" as a recognizable input"));
@@ -109,37 +139,61 @@ function sendInput(_x, _x2, _x3, _x4) {
109
139
 
110
140
  function _sendInput() {
111
141
  _sendInput = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee7(inputs, result, message, caption) {
112
- var canvas;
142
+ var width, images, left, canvas;
113
143
  return _regenerator["default"].wrap(function _callee7$(_context7) {
114
144
  while (1) {
115
145
  switch (_context7.prev = _context7.next) {
116
146
  case 0:
117
- _context7.next = 2;
118
- return (0, _sharp["default"])({
147
+ width = result.map(function (it) {
148
+ return _info.sizes[it] || 152;
149
+ }).reduce(function (a, b) {
150
+ return a + b;
151
+ }, 0);
152
+ images = [];
153
+ left = 0;
154
+ result.forEach(function (it, index) {
155
+ var size = _info.sizes[it] || 152;
156
+ images.push({
157
+ input: inputs.get(it),
158
+ left: left,
159
+ top: Math.floor((152 - size) / 2)
160
+ });
161
+ left += size;
162
+ });
163
+ canvas = (0, _sharp["default"])({
119
164
  create: {
120
- width: 152 * result.length,
165
+ width: width,
121
166
  height: 152,
122
167
  channels: 4,
123
168
  background: 'transparent'
124
169
  }
125
- }).composite(result.map(function (it, index) {
126
- return {
127
- input: inputs.get(it),
128
- left: index * 152,
129
- top: 0,
130
- width: 152,
131
- height: 152
132
- };
133
- })).png().toBuffer();
170
+ }).png().composite(images);
171
+ _context7.next = 7;
172
+ return canvas.toBuffer();
134
173
 
135
- case 2:
174
+ case 7:
136
175
  canvas = _context7.sent;
176
+
177
+ if (!(result.length < 12)) {
178
+ _context7.next = 12;
179
+ break;
180
+ }
181
+
182
+ _context7.next = 11;
183
+ return (0, _sharp["default"])(canvas).resize({
184
+ height: 55
185
+ }).png().toBuffer();
186
+
187
+ case 11:
188
+ canvas = _context7.sent;
189
+
190
+ case 12:
137
191
  return _context7.abrupt("return", message.reply({
138
192
  content: caption,
139
193
  files: [canvas]
140
194
  }));
141
195
 
142
- case 4:
196
+ case 13:
143
197
  case "end":
144
198
  return _context7.stop();
145
199
  }
@@ -149,13 +203,14 @@ function _sendInput() {
149
203
  return _sendInput.apply(this, arguments);
150
204
  }
151
205
 
152
- var builtin = {
153
- 37: {
154
- game: 'sf',
155
- caption: '***LETS GO JUSTIN!***',
156
- input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk'
157
- }
158
- };
206
+ function checkGame(game) {
207
+ return gameInputs.has(game) ? game : _info.aliases.games[game];
208
+ }
209
+
210
+ function isString(x) {
211
+ return Object.prototype.toString.call(x) === '[object String]';
212
+ }
213
+
159
214
  var _default = {
160
215
  name: 'fg-notation',
161
216
  about: {
@@ -207,7 +262,7 @@ var _default = {
207
262
  }
208
263
 
209
264
  name = message.content.split(' ').pop().replace(prefix, '');
210
- _context.t0 = builtin[name];
265
+ _context.t0 = _info.builtin[name];
211
266
 
212
267
  if (_context.t0) {
213
268
  _context.next = 12;
@@ -249,7 +304,7 @@ var _default = {
249
304
  example: 'fgi sf 236P 214K',
250
305
  execute: function () {
251
306
  var _execute = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(_ref, _ref2) {
252
- var param, message, _param, game, i1, inputs, result;
307
+ var param, message, _param, gameInput, i1, game, inputs, result;
253
308
 
254
309
  return _regenerator["default"].wrap(function _callee2$(_context2) {
255
310
  while (1) {
@@ -257,9 +312,9 @@ var _default = {
257
312
  case 0:
258
313
  param = _ref.param;
259
314
  message = _ref2.message;
260
- _param = (0, _slicedToArray2["default"])(param, 3), game = _param[1], i1 = _param[2];
315
+ _param = (0, _slicedToArray2["default"])(param, 3), gameInput = _param[1], i1 = _param[2];
261
316
 
262
- if (!(!game || !i1)) {
317
+ if (!(!gameInput || !i1)) {
263
318
  _context2.next = 5;
264
319
  break;
265
320
  }
@@ -267,21 +322,27 @@ var _default = {
267
322
  return _context2.abrupt("return", message.reply('Missing arguments. Example: >fgi sf 236P 214K'));
268
323
 
269
324
  case 5:
325
+ game = checkGame(gameInput);
326
+
270
327
  if (gameInputs.has(game)) {
271
- _context2.next = 7;
328
+ _context2.next = 8;
272
329
  break;
273
330
  }
274
331
 
275
332
  return _context2.abrupt("return", message.reply("\"".concat(game, "\" is not a valid game. Available games: ").concat(Array.from(gameInputs.keys()).join(' '))));
276
333
 
277
- case 7:
278
- inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
279
- result = param.slice(2).map(function (i) {
280
- return solveInput(inputs, i.toLowerCase());
281
- }).flat();
282
- sendInput(inputs, result, message);
334
+ case 8:
335
+ try {
336
+ inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
337
+ result = param.slice(2).map(function (i) {
338
+ return solveInput(inputs, i.toLowerCase());
339
+ }).flat();
340
+ sendInput(inputs, result, message);
341
+ } catch (err) {
342
+ message.reply(err.message);
343
+ }
283
344
 
284
- case 10:
345
+ case 9:
285
346
  case "end":
286
347
  return _context2.stop();
287
348
  }
@@ -302,7 +363,7 @@ var _default = {
302
363
  example: 'fgi sf testName 236P 214K',
303
364
  execute: function () {
304
365
  var _execute2 = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3(_ref3, _ref4) {
305
- var param, sequelize, message, _param2, game, name, i1, inputs, input;
366
+ var param, sequelize, message, _param2, gameInput, name, i1, game, inputs, input;
306
367
 
307
368
  return _regenerator["default"].wrap(function _callee3$(_context3) {
308
369
  while (1) {
@@ -310,9 +371,9 @@ var _default = {
310
371
  case 0:
311
372
  param = _ref3.param, sequelize = _ref3.sequelize;
312
373
  message = _ref4.message;
313
- _param2 = (0, _slicedToArray2["default"])(param, 4), game = _param2[1], name = _param2[2], i1 = _param2[3];
374
+ _param2 = (0, _slicedToArray2["default"])(param, 4), gameInput = _param2[1], name = _param2[2], i1 = _param2[3];
314
375
 
315
- if (!(!game || !name || !i1)) {
376
+ if (!(!gameInput || !name || !i1)) {
316
377
  _context3.next = 5;
317
378
  break;
318
379
  }
@@ -320,19 +381,22 @@ var _default = {
320
381
  return _context3.abrupt("return", message.reply('Missing arguments. Example: >fgi sf testName 236P 214K'));
321
382
 
322
383
  case 5:
384
+ game = checkGame(gameInput);
385
+
323
386
  if (gameInputs.has(game)) {
324
- _context3.next = 7;
387
+ _context3.next = 8;
325
388
  break;
326
389
  }
327
390
 
328
391
  return _context3.abrupt("return", message.reply("\"".concat(game, "\" is not a valid game. Available games: ").concat(Array.from(gameInputs.keys()).join(' '))));
329
392
 
330
- case 7:
393
+ case 8:
394
+ _context3.prev = 8;
331
395
  inputs = new Map([].concat((0, _toConsumableArray2["default"])(basicInputs), (0, _toConsumableArray2["default"])(gameInputs.get(game))));
332
396
  input = param.slice(3).map(function (i) {
333
397
  return solveInput(inputs, i.toLowerCase());
334
398
  }).flat().join(' ');
335
- _context3.next = 11;
399
+ _context3.next = 13;
336
400
  return sequelize.models.fginput.create({
337
401
  guild: message.guild.id,
338
402
  name: name,
@@ -341,15 +405,22 @@ var _default = {
341
405
  input: input
342
406
  });
343
407
 
344
- case 11:
408
+ case 13:
345
409
  message.channel.send("Saved command \"".concat(input, "\" as \"").concat(name, "\""));
410
+ _context3.next = 19;
411
+ break;
346
412
 
347
- case 12:
413
+ case 16:
414
+ _context3.prev = 16;
415
+ _context3.t0 = _context3["catch"](8);
416
+ message.reply(_context3.t0.message);
417
+
418
+ case 19:
348
419
  case "end":
349
420
  return _context3.stop();
350
421
  }
351
422
  }
352
- }, _callee3);
423
+ }, _callee3, null, [[8, 16]]);
353
424
  }));
354
425
 
355
426
  function execute(_x7, _x8) {
package/lib/info.json ADDED
@@ -0,0 +1,33 @@
1
+ {
2
+ "sizes": { "+": 55 },
3
+
4
+ "builtin": {
5
+ "37": {
6
+ "game": "sf",
7
+ "caption": "***LETS GO JUSTIN!***",
8
+ "input": "6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk"
9
+ }
10
+ },
11
+
12
+ "aliases": {
13
+ "games": {
14
+ "bbt": "bbtag",
15
+ "db": "dbz"
16
+ },
17
+
18
+ "inputs": {
19
+ "basic": {
20
+ "doubleforward": [">>"]
21
+ },
22
+
23
+ "games": {
24
+ "bbtag": {
25
+ "throw": ["b","+","c"],
26
+ "crb": ["d","+","p"],
27
+ "airdash": ["a","+","b"],
28
+ "reversal": ["a","+","d"]
29
+ }
30
+ }
31
+ }
32
+ }
33
+ }
package/package.json CHANGED
@@ -1,20 +1,22 @@
1
1
  {
2
2
  "name": "@lotus-tree/fg-notation",
3
- "version": "1.1.4",
3
+ "version": "1.2.0",
4
4
  "main": "lib/index.js",
5
5
  "module": "src/index.js",
6
6
  "scripts": {
7
7
  "run-babel": "babel --delete-dir-on-start --copy-files src",
8
8
  "build": "yarn run run-babel --out-dir lib",
9
- "dev": "yarn run run-babel --watch --out-dir dev",
9
+ "dev": "yarn run run-babel --watch --source-maps inline --out-dir dev",
10
10
  "prepublishOnly": "yarn build"
11
11
  },
12
12
  "dependencies": {
13
- "@lotus-tree/command-handler": "^2.1.0",
14
13
  "bent": "^7.3.12",
15
14
  "glob": "^7.2.0",
16
15
  "sharp": "^0.29.3"
17
16
  },
17
+ "peerDependencies": {
18
+ "@lotus-tree/command-handler": "^2.1.0"
19
+ },
18
20
  "devDependencies": {
19
21
  "@babel/cli": "^7.16.7",
20
22
  "@babel/core": "^7.16.7",
Binary file
Binary file
Binary file
Binary file
Binary file
Binary file
package/src/index.js CHANGED
@@ -4,6 +4,8 @@ import glob from 'glob'
4
4
  import { DataTypes } from 'sequelize'
5
5
  import bent from 'bent'
6
6
 
7
+ import { sizes, aliases, builtin } from './info.json'
8
+
7
9
  const getJSON = bent('json')
8
10
  const imgPath = path.join(__dirname, 'img')
9
11
  const basicInputs = new Map()
@@ -34,46 +36,81 @@ glob.sync(path.join(imgPath, 'basic/**'), { nodir: true })
34
36
  .forEach(p => {
35
37
  const input = p.split('/').pop().replace('.png', '')
36
38
  basicInputs.set(input, p)
37
- })
38
39
 
39
- basicInputs.set('>>', path.join(imgPath, 'basic/doubleforward.png'))
40
+ const alias = aliases.inputs.basic[input]
41
+ if (alias) {
42
+ alias.forEach(i => {
43
+ basicInputs.set(i, p)
44
+ if (sizes[input]) sizes[i] = sizes[input]
45
+ })
46
+ }
47
+ })
40
48
 
41
- glob.sync(path.join(imgPath, 'games/**'), { nodir: true })
49
+ glob.sync(path.join(imgPath, 'games/*'))
42
50
  .forEach(p => {
43
- const { dir, name } = path.parse(path.relative(path.join(imgPath, 'games'), p))
51
+ const { base } = path.parse(path.relative(path.join(imgPath, 'games'), p))
52
+ gameInputs.set(base, new Map())
53
+
54
+ glob.sync(path.join(imgPath, 'games', base, '**'), { nodir: true })
55
+ .forEach(input => {
56
+ const { name } = path.parse(input)
57
+ gameInputs.get(base).set(name, input)
58
+ })
59
+
60
+ const alias = aliases.inputs.games[base]
44
61
 
45
- if (!gameInputs.has(dir)) gameInputs.set(dir, new Map())
46
- gameInputs.get(dir).set(name, p)
62
+ if (alias) {
63
+ for (const [a, s] of Object.entries(alias)) {
64
+ gameInputs.get(base).set(a, s)
65
+ }
66
+ }
47
67
  })
48
68
 
49
69
  function solveInput (inputs, input) {
50
- if (inputs.has(input)) return [input]
70
+ if (inputs.has(input)) return isString(inputs.get(input)) ? [input] : inputs.get(input)
51
71
 
52
72
  for (let i = 0; i < input.length; i++) {
53
73
  const s1 = input.slice(0, 0 - i)
54
- if (inputs.has(s1)) return [s1, ...solveInput(inputs, input.slice(0 - i))]
74
+
75
+ if (inputs.has(s1)) {
76
+ const result = inputs.get(s1)
77
+ const remaining = solveInput(inputs, input.slice(0 - i))
78
+
79
+ return isString(result) ? [s1, ...remaining] : [...result, ...remaining]
80
+ }
55
81
  }
56
82
 
57
83
  throw new Error(`Cannot find "${input}" as a recognizable input`)
58
84
  }
59
85
 
60
86
  async function sendInput (inputs, result, message, caption) {
61
- const canvas = await sharp({ create: { width: 152 * result.length, height: 152, channels: 4, background: 'transparent' } })
62
- .composite(result.map((it, index) =>
63
- ({ input: inputs.get(it), left: index * 152, top: 0, width: 152, height: 152 })
64
- ))
87
+ const width = result.map(it => sizes[it] || 152).reduce((a, b) => a + b, 0)
88
+ const images = []
89
+ let left = 0
90
+
91
+ result.forEach((it, index) => {
92
+ const size = sizes[it] || 152
93
+ images.push({ input: inputs.get(it), left, top: Math.floor((152 - size) / 2) })
94
+ left += size
95
+ })
96
+
97
+ let canvas = sharp({ create: { width, height: 152, channels: 4, background: 'transparent' } })
65
98
  .png()
66
- .toBuffer()
99
+ .composite(images)
100
+
101
+ canvas = await canvas.toBuffer()
102
+
103
+ if (result.length < 12) canvas = await sharp(canvas).resize({ height: 55 }).png().toBuffer()
67
104
 
68
105
  return message.reply({ content: caption, files: [canvas] })
69
106
  }
70
107
 
71
- const builtin = {
72
- 37: {
73
- game: 'sf',
74
- caption: '***LETS GO JUSTIN!***',
75
- input: '6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk'
76
- }
108
+ function checkGame (game) {
109
+ return gameInputs.has(game) ? game : aliases.games[game]
110
+ }
111
+
112
+ function isString (x) {
113
+ return Object.prototype.toString.call(x) === '[object String]'
77
114
  }
78
115
 
79
116
  export default {
@@ -132,14 +169,20 @@ export default {
132
169
  desc: 'Converts a list of inputs into an image',
133
170
  example: 'fgi sf 236P 214K',
134
171
  execute: async ({ param }, { message }) => {
135
- const [, game, i1] = param
136
- if (!game || !i1) return message.reply('Missing arguments. Example: >fgi sf 236P 214K')
172
+ const [, gameInput, i1] = param
173
+ if (!gameInput || !i1) return message.reply('Missing arguments. Example: >fgi sf 236P 214K')
174
+
175
+ const game = checkGame(gameInput)
137
176
  if (!gameInputs.has(game)) return message.reply(`"${game}" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)
138
177
 
139
- const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
140
- const result = param.slice(2).map(i => solveInput(inputs, i.toLowerCase())).flat()
178
+ try {
179
+ const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
180
+ const result = param.slice(2).map(i => solveInput(inputs, i.toLowerCase())).flat()
141
181
 
142
- sendInput(inputs, result, message)
182
+ sendInput(inputs, result, message)
183
+ } catch (err) {
184
+ message.reply(err.message)
185
+ }
143
186
  }
144
187
  },
145
188
  fgsave: {
@@ -147,16 +190,22 @@ export default {
147
190
  desc: 'Saves a list of inputs into a command',
148
191
  example: 'fgi sf testName 236P 214K',
149
192
  execute: async ({ param, sequelize }, { message }) => {
150
- const [, game, name, i1] = param
151
- if (!game || !name || !i1) return message.reply('Missing arguments. Example: >fgi sf testName 236P 214K')
193
+ const [, gameInput, name, i1] = param
194
+ if (!gameInput || !name || !i1) return message.reply('Missing arguments. Example: >fgi sf testName 236P 214K')
195
+
196
+ const game = checkGame(gameInput)
152
197
  if (!gameInputs.has(game)) return message.reply(`"${game}" is not a valid game. Available games: ${Array.from(gameInputs.keys()).join(' ')}`)
153
198
 
154
- const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
155
- const input = param.slice(3).map(i => solveInput(inputs, i.toLowerCase())).flat().join(' ')
199
+ try {
200
+ const inputs = new Map([...basicInputs, ...gameInputs.get(game)])
201
+ const input = param.slice(3).map(i => solveInput(inputs, i.toLowerCase())).flat().join(' ')
156
202
 
157
- await sequelize.models.fginput.create({ guild: message.guild.id, name, createdBy: message.author.id, game, input })
203
+ await sequelize.models.fginput.create({ guild: message.guild.id, name, createdBy: message.author.id, game, input })
158
204
 
159
- message.channel.send(`Saved command "${input}" as "${name}"`)
205
+ message.channel.send(`Saved command "${input}" as "${name}"`)
206
+ } catch (err) {
207
+ message.reply(err.message)
208
+ }
160
209
  }
161
210
  },
162
211
  fgcaption: {
package/src/info.json ADDED
@@ -0,0 +1,33 @@
1
+ {
2
+ "sizes": { "+": 55 },
3
+
4
+ "builtin": {
5
+ "37": {
6
+ "game": "sf",
7
+ "caption": "***LETS GO JUSTIN!***",
8
+ "input": "6 6 6 6 6 6 6 >> 6 6 6 6 6 6 6 >> 8 6 j. hk >> 2 mk >> 623 mp >> 236 236 lk"
9
+ }
10
+ },
11
+
12
+ "aliases": {
13
+ "games": {
14
+ "bbt": "bbtag",
15
+ "db": "dbz"
16
+ },
17
+
18
+ "inputs": {
19
+ "basic": {
20
+ "doubleforward": [">>"]
21
+ },
22
+
23
+ "games": {
24
+ "bbtag": {
25
+ "throw": ["b","+","c"],
26
+ "crb": ["d","+","p"],
27
+ "airdash": ["a","+","b"],
28
+ "reversal": ["a","+","d"]
29
+ }
30
+ }
31
+ }
32
+ }
33
+ }