From 82d83a38eb2a83ba35e2b7b644d51a9ff72806a1 Mon Sep 17 00:00:00 2001 From: WubzyGD Date: Thu, 8 Oct 2020 10:14:09 -0600 Subject: [PATCH] Deathnote custom message, tags implementation --- commands/deathnote.js | 5 +++++ util/test.js | 19 ------------------- 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 util/test.js diff --git a/commands/deathnote.js b/commands/deathnote.js index fd79366..fba65e8 100644 --- a/commands/deathnote.js +++ b/commands/deathnote.js @@ -1,5 +1,7 @@ const Discord = require('discord.js'); const moment = require('moment'); +const {Tag} = require('../util/tag'); +const {TagFilter} = require('../util/tagfilter'); const deaths = [ "watching too much anime", "an overdose of waifus", "Hypotakunemia", "trying to self-isekai", @@ -66,6 +68,9 @@ module.exports = { let title = reptype.titles[Math.floor(Math.random() * reptype.titles.length)]; let pretext = before[Math.floor(Math.random() * before.length)]; + let options = new TagFilter([new Tag(['method', '-m', 'cause', '-c'], 'method', 'append')]).test(args.splice(0, 1).join(" ")); + if (options.method.length) {death = options.method;} + let victim = message.mentions.members.first(); let killer = message.member; diff --git a/util/test.js b/util/test.js deleted file mode 100644 index 6013ce5..0000000 --- a/util/test.js +++ /dev/null @@ -1,19 +0,0 @@ -const {Tag} = require('./tag'); -const {TagFilter} = require('./tagfilter'); - -let myATag = new Tag(["-name", "-n"], "name", "append"); -let myTTag = new Tag(["force"], "force", "toggle"); -myTTag.addTrigger('f'); - -console.log(myATag); -console.log(myTTag); - -let myFilter = new TagFilter([myATag, myTTag]); -console.log(myFilter); -console.log(myFilter.test("create -n jacob clark -f")); - -console.log(new TagFilter([ - new Tag(['-reason', '-r'], 'reason', 'append'), - new Tag(['-against', '-a'], 'against', 'append'), - new Tag(['-force', '-f'], 'force', 'toggle') -]).test('d6 d6 d10 -r to suffer -against myself -f')); \ No newline at end of file