diff --git a/assets/images/yu-gi-oh-gen/atrs/dark.png b/assets/images/yu-gi-oh-gen/atrs/dark.png new file mode 100644 index 00000000..e661dcbc Binary files /dev/null and b/assets/images/yu-gi-oh-gen/atrs/dark.png differ diff --git a/assets/images/yu-gi-oh-gen/atrs/divine.png b/assets/images/yu-gi-oh-gen/atrs/divine.png new file mode 100644 index 00000000..a24545c2 Binary files /dev/null and b/assets/images/yu-gi-oh-gen/atrs/divine.png differ diff --git a/assets/images/yu-gi-oh-gen/atrs/earth.png b/assets/images/yu-gi-oh-gen/atrs/earth.png new file mode 100644 index 00000000..893b8d74 Binary files /dev/null and b/assets/images/yu-gi-oh-gen/atrs/earth.png differ diff --git a/assets/images/yu-gi-oh-gen/atrs/fire.png b/assets/images/yu-gi-oh-gen/atrs/fire.png new file mode 100644 index 00000000..9f0c515b Binary files /dev/null and b/assets/images/yu-gi-oh-gen/atrs/fire.png differ diff --git a/assets/images/yu-gi-oh-gen/atrs/laugh.png b/assets/images/yu-gi-oh-gen/atrs/laugh.png new file mode 100644 index 00000000..bf5a2167 Binary files /dev/null and b/assets/images/yu-gi-oh-gen/atrs/laugh.png differ diff --git a/assets/images/yu-gi-oh-gen/atr.png b/assets/images/yu-gi-oh-gen/atrs/light.png similarity index 100% rename from assets/images/yu-gi-oh-gen/atr.png rename to assets/images/yu-gi-oh-gen/atrs/light.png diff --git a/assets/images/yu-gi-oh-gen/atrs/water.png b/assets/images/yu-gi-oh-gen/atrs/water.png new file mode 100644 index 00000000..b1f65907 Binary files /dev/null and b/assets/images/yu-gi-oh-gen/atrs/water.png differ diff --git a/assets/images/yu-gi-oh-gen/atrs/wind.png b/assets/images/yu-gi-oh-gen/atrs/wind.png new file mode 100644 index 00000000..3fc80471 Binary files /dev/null and b/assets/images/yu-gi-oh-gen/atrs/wind.png differ diff --git a/commands/edit-image/yu-gi-oh-gen.js b/commands/edit-image/yu-gi-oh-gen.js index 0398f2cd..269dc953 100644 --- a/commands/edit-image/yu-gi-oh-gen.js +++ b/commands/edit-image/yu-gi-oh-gen.js @@ -2,7 +2,9 @@ const Command = require('../../structures/Command'); const { createCanvas, loadImage, registerFont } = require('canvas'); const request = require('node-superfetch'); const path = require('path'); +const { list } = require('../../util/Util'); const { wrapText } = require('../../util/Canvas'); +const atrs = ['dark', 'divine', 'earth', 'fire', 'laugh', 'light', 'water', 'wind']; registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Matrix Book.ttf'), { family: 'Matrix Book' }); registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Matrix Small Caps.ttf'), { family: 'Matrix' }); registerFont(path.join(__dirname, '..', '..', 'assets', 'fonts', 'Stone Serif.ttf'), { family: 'Stone Serif' }); @@ -57,6 +59,13 @@ module.exports = class YuGiOhGenCommand extends Command { type: 'string', max: 50 }, + { + key: 'attribute', + prompt: `What attribute should the card be? Either ${list(atrs, 'or')}.`, + type: 'string', + oneOf: atrs, + parse: attribute => attribute.toLowerCase() + }, { key: 'effect', prompt: 'What should the card\'s effect be?', @@ -99,12 +108,14 @@ module.exports = class YuGiOhGenCommand extends Command { }); } - async run(msg, { name, effect, type, level, attack, defense, image }) { + async run(msg, { name, attribute, effect, type, level, attack, defense, image }) { const id = Math.floor(Math.random() * 100000000); const setID = Math.floor(Math.random() * 1000); try { const base = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'yu-gi-oh-gen', 'base.png')); - const atr = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'yu-gi-oh-gen', 'atr.png')); + const atr = await loadImage( + path.join(__dirname, '..', '..', 'assets', 'images', 'yu-gi-oh-gen', 'atrs', `${attribute}.png`) + ); const levelI = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'yu-gi-oh-gen', 'level.png')); const line = await loadImage(path.join(__dirname, '..', '..', 'assets', 'images', 'yu-gi-oh-gen', 'line.png')); const { body } = await request.get(image); diff --git a/package.json b/package.json index c7f0a5eb..12fa3cf8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "116.20.0", + "version": "116.20.1", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {