mirror of
https://github.com/ION606/selmerBot.git
synced 2026-05-14 21:26:54 +00:00
Added the 'heal' command and potion functionionality. It doesn't work for the opponent for some reason
This commit is contained in:
@@ -41,11 +41,14 @@ async function welcome(member, welcomechannel, welcomemessage = null, welcomeban
|
||||
|
||||
// Declare a base size of the font
|
||||
let fontSize = 70;
|
||||
let i = 0;
|
||||
|
||||
do {
|
||||
// Assign the font to the context and decrement it so it can be measured again
|
||||
context.font = `italic ${fontSize -= 10}px sans-serif`;
|
||||
// Compare pixel width of the text to the canvas minus the approximate avatar size
|
||||
|
||||
i ++;
|
||||
} while (context.measureText(text).width > canvas.width - 100);
|
||||
|
||||
// Return the result to use in the actual canvas
|
||||
@@ -62,9 +65,9 @@ async function welcome(member, welcomechannel, welcomemessage = null, welcomeban
|
||||
text = text.replace('{ut}', member.user.discriminator);
|
||||
}
|
||||
|
||||
context.font = applyText(canvas, text);
|
||||
context.font= applyText(canvas, text);
|
||||
context.fillStyle = '#ffffff';
|
||||
context.fillText(text, (canvas.width/2) - (text.length * 7.5), canvas.height - 15);
|
||||
context.fillText(text, (canvas.width/2) - (context.measureText(text).width)/2, canvas.height - 15);
|
||||
|
||||
|
||||
//Draw a white circle
|
||||
|
||||
+95
-45
@@ -1,10 +1,35 @@
|
||||
//@ts-check
|
||||
const { MessageActionRow, MessageButton, MessageSelectMenu } = require('discord.js');
|
||||
const { STATE } = require('./econ');
|
||||
const { winGame } = require('./external_game_functions.js');
|
||||
const { winGame, getCustomEmoji } = require('./external_game_functions.js');
|
||||
const { changeTurn } = require('../turnManager.js');
|
||||
|
||||
|
||||
function postActionBar(thread, user_dbo) {
|
||||
const row = new MessageActionRow()
|
||||
.addComponents(
|
||||
new MessageButton()
|
||||
.setCustomId('ATTACK')
|
||||
.setLabel('ATTACK')
|
||||
.setStyle('DANGER'),
|
||||
new MessageButton()
|
||||
.setCustomId('HEAL')
|
||||
.setLabel('HEAL')
|
||||
.setStyle('SUCCESS'),
|
||||
new MessageButton()
|
||||
.setCustomId('DEFEND')
|
||||
.setLabel('DEFEND')
|
||||
.setStyle('PRIMARY'),
|
||||
new MessageButton()
|
||||
.setCustomId('ITEMS')
|
||||
.setLabel('ITEMS')
|
||||
.setStyle('SECONDARY')
|
||||
);
|
||||
|
||||
thread.send({ content: `Your turn <@${user_dbo.s.namespace.collection}>!`, components: [row] });
|
||||
}
|
||||
|
||||
|
||||
/**
|
||||
* Called by "attack"
|
||||
*/
|
||||
@@ -63,7 +88,7 @@ function attack(client, user_dbo, other_dbo, bot, thread, command, mongouri, ite
|
||||
/**
|
||||
* Called by "item"
|
||||
*/
|
||||
async function heal(interaction, user_dbo, bot, thread, command, mongouri, items) {
|
||||
async function heal(interaction, client, user_dbo, bot, thread, command, mongouri, items) {
|
||||
if (interaction.message.content.toLowerCase().indexOf('Which item would you like to use?') != -1) {
|
||||
// The person picked out an item
|
||||
}
|
||||
@@ -71,29 +96,47 @@ async function heal(interaction, user_dbo, bot, thread, command, mongouri, items
|
||||
user_dbo.find({'equipped': {$exists: true}}).toArray(async function(err, docs) {
|
||||
const doc = docs[0];
|
||||
const rawitems = doc.equipped.items;
|
||||
if (JSON.stringify(rawitems) == '{}') { return thread.send("You don't have any items!"); }
|
||||
const items = rawitems.filter(function(f) { return (f.sect.toLowerCase() == 'healing') });
|
||||
const items = rawitems.filter(function(f) { return (f.sect.toLowerCase() == 'hp') });
|
||||
|
||||
|
||||
if (JSON.stringify(items) == '[]') {
|
||||
postActionBar(thread, user_dbo);
|
||||
return interaction.editReply("You don't have any items!");
|
||||
} else { console.log(JSON.stringify(items))}
|
||||
|
||||
var itemlist = [];
|
||||
|
||||
items.forEach(function(item) {
|
||||
let n = item.name;
|
||||
|
||||
let h = (doc.rank - 1) + Math.round(item.cost/10);
|
||||
|
||||
itemlist.push({label: n, description: `Restores ${h} health (${item.num})`, value: `${n}`});
|
||||
});
|
||||
|
||||
|
||||
//Find something to heal with
|
||||
const row = new MessageActionRow()
|
||||
.addComponents(
|
||||
new MessageSelectMenu()
|
||||
.setCustomId(`${interaction.user.id}|heal`)
|
||||
.setPlaceholder('Nothing selected')
|
||||
.addOptions([
|
||||
{
|
||||
label: 'Select me',
|
||||
description: 'This is a description',
|
||||
value: 'first_option',
|
||||
},
|
||||
{
|
||||
label: 'You can select me too',
|
||||
description: 'This is also a description',
|
||||
value: 'second_option',
|
||||
},
|
||||
]),
|
||||
.addOptions(itemlist),
|
||||
// .addOptions([
|
||||
// {
|
||||
// label: 'Select me',
|
||||
// description: 'This is a description',
|
||||
// value: 'first_option',
|
||||
// },
|
||||
// {
|
||||
// label: 'You can select me too',
|
||||
// description: 'This is also a description',
|
||||
// value: 'second_option',
|
||||
// },
|
||||
// ])
|
||||
);
|
||||
|
||||
await interaction.reply({ content: 'Pong!', components: [row] });
|
||||
await interaction.editReply({ content: 'Please choose a health potion!', components: [row] });
|
||||
});
|
||||
}
|
||||
|
||||
@@ -113,38 +156,43 @@ function defend(user_dbo, bot, thread, command, mongouri, items) {
|
||||
})
|
||||
}
|
||||
|
||||
|
||||
function usePotion(interaction, client, user_dbo, bot, thread, command, mongouri) {
|
||||
const name = interaction.values[0];
|
||||
const cursor = user_dbo.find({'equipped.items': {$exists: true}});
|
||||
|
||||
let doc = cursor.next().then((result) => {
|
||||
var allitems = Array.from(result.equipped.items);
|
||||
let items = allitems.filter((it) => { return it.name == name; })[0];
|
||||
let ind = allitems.findIndex((it) => { return it.name == name; })
|
||||
|
||||
//Apply the item's effects
|
||||
if (name.toLowerCase().indexOf('hp') != -1) {
|
||||
let h = (result.rank - 1) + Math.round(items.cost/10);
|
||||
user_dbo.updateOne({"game": {$exists: true}}, { $set: {'hpmp.hp': (result.hpmp.hp + h)}})
|
||||
}
|
||||
|
||||
//Deal with the item itself
|
||||
//If there's more than 1, subtract 1
|
||||
if (items.num > 1) { items.num -= 1; allitems[ind] = items; }
|
||||
else { allitems.splice(ind, 1) }
|
||||
|
||||
user_dbo.updateOne({'equipped.items': {$exists: true}}, {$set: {'equipped.items': allitems}});
|
||||
})
|
||||
|
||||
|
||||
changeTurn(client, bot, interaction);
|
||||
postActionBar(thread, user_dbo);
|
||||
}
|
||||
|
||||
|
||||
function cast() {
|
||||
|
||||
}
|
||||
|
||||
|
||||
function postActionBar(thread, user_dbo) {
|
||||
const row = new MessageActionRow()
|
||||
.addComponents(
|
||||
new MessageButton()
|
||||
.setCustomId('ATTACK')
|
||||
.setLabel('ATTACK')
|
||||
.setStyle('DANGER'),
|
||||
new MessageButton()
|
||||
.setCustomId('HEAL')
|
||||
.setLabel('HEAL')
|
||||
.setStyle('SUCCESS'),
|
||||
new MessageButton()
|
||||
.setCustomId('DEFEND')
|
||||
.setLabel('DEFEND')
|
||||
.setStyle('PRIMARY'),
|
||||
new MessageButton()
|
||||
.setCustomId('ITEMS')
|
||||
.setLabel('ITEMS')
|
||||
.setStyle('SECONDARY')
|
||||
);
|
||||
|
||||
thread.send({ content: `Your turn <@${user_dbo.s.namespace.collection}>!`, components: [row] });
|
||||
}
|
||||
|
||||
|
||||
|
||||
function handle(client, user_dbo, other_dbo, bot, thread, command, mongouri, items, interaction, xp_collection) {
|
||||
async function handle(client, user_dbo, other_dbo, bot, thread, command, mongouri, items, interaction, xp_collection) {
|
||||
if (command == 'initalize') {
|
||||
return postActionBar(thread, user_dbo);
|
||||
} else if (command == 'attack') {
|
||||
@@ -153,10 +201,12 @@ function handle(client, user_dbo, other_dbo, bot, thread, command, mongouri, ite
|
||||
} else if (command == 'items') {
|
||||
item();
|
||||
} else if (command == 'heal') {
|
||||
heal(interaction, user_dbo, bot, thread, command, mongouri, items);
|
||||
heal(interaction, client, user_dbo, bot, thread, command, mongouri, items); //.then(() => {postActionBar(thread, other_dbo)});
|
||||
} else if (command == 'usepotion') {
|
||||
usePotion(interaction, client, user_dbo, bot, thread, command, mongouri);
|
||||
}
|
||||
|
||||
// initiate(user_dbo, other_dbo, command, message);
|
||||
}
|
||||
|
||||
module.exports = { handle }
|
||||
module.exports = { handle, postActionBar }
|
||||
|
||||
@@ -59,4 +59,24 @@ function winGame(client, bot, db, user_dbo, xp_collection, message) {
|
||||
}
|
||||
|
||||
|
||||
module.exports = { winGame, loseGame }
|
||||
function equipItem(client, bot, db, dbo, message) {
|
||||
if (!bot.inDebugMode) { return; }
|
||||
let items = [
|
||||
{ name: 'HP Potion', cost: 20, icon: 'CUSTOM|healing_potion', sect: 'HP', num: 2 },
|
||||
{ name: 'Super HP Potion', cost: 50, icon: 'CUSTOM|super_healing_potion', sect: 'HP', num: 2 },
|
||||
{ name: 'MP Potion', cost: 15, icon: 'CUSTOM|mana_potion', sect: 'MP', num: 2 }
|
||||
]
|
||||
|
||||
dbo.updateMany({}, {$set: {'equipped.items': items}});
|
||||
}
|
||||
|
||||
function getCustomEmoji(bot, name) {
|
||||
let srv = bot.guilds.cache.get(bot.home_server).emojis.cache;
|
||||
// console.log(srv);
|
||||
let emj = srv.find((g) => { return g.name == name });
|
||||
// message.channel.send(`${emj}`);
|
||||
return `${emj}`;
|
||||
}
|
||||
|
||||
|
||||
module.exports = { winGame, loseGame, equipItem, getCustomEmoji }
|
||||
+4
-1
@@ -7,7 +7,7 @@ let snowflake = require("./addons/snowflake.js");
|
||||
const STATE = ecoimport.STATE;
|
||||
const BASE = ecoimport.BASE;
|
||||
|
||||
const { winGame, loseGame } = require('./external_game_functions.js');
|
||||
const { winGame, loseGame, equipItem } = require('./external_game_functions.js');
|
||||
|
||||
//Has a list of all games (used to change player state)
|
||||
const allGames = ['battle'];
|
||||
@@ -152,6 +152,7 @@ function in_game_redirector(bot, interaction, threadname, doc, client, mongouri,
|
||||
|
||||
dbo.find({'game': {$exists: true}}).toArray(function (err, docs) {
|
||||
const game = docs[0].game
|
||||
|
||||
switch (game) {
|
||||
case 'battle': handle(client, dbo, other, bot, thread, interaction.customId.toLowerCase(), mongouri, items, interaction, xp_collection);
|
||||
}
|
||||
@@ -274,6 +275,8 @@ module.exports ={
|
||||
getGame(message, args, db);
|
||||
} else if (command == 'hp' || command == 'mp') {
|
||||
hpmp(message, command, dbo);
|
||||
} else if (command == 'equip') {
|
||||
equipItem(client, bot, db, dbo, message);
|
||||
}
|
||||
//#endregion
|
||||
|
||||
|
||||
Reference in New Issue
Block a user