marcus/dsabot
1
0
Fork 0
Code Issues Pull Requests 10 Actions Packages Projects Releases Wiki Activity

Merge pull request #16 from TobenderZephyr/cleanup

Browse Source 
(fix) refactoring of Skill command
This commit is contained in:
Marcus Netz
2021-04-18 22:29:43 +02:00
committed by GitHub
parent 86c47619d9 6ec0a2fe68
commit e89465250e
4 changed files with 27 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
commands/Skill.js
View File

@ -1,6 +1,7 @@
const globals = require('../globals');
const db = globals.db;
const { findMessage }= require('@dsabot/findMessage');
const { getSkill } = require('@dsabot/getSkill');
module.exports = {
name: 'skill',
description: 'Zeigt dir deinen Fertigkeitswert im jeweiligen Talent.',
@ -17,16 +18,9 @@ module.exports = {
return message.reply(findMessage('NOENTRY'));
}
else {
let level = 0;
/*
for (let i in docs[0].character.skills) {
if (docs[0].character.skills[i].id == args[0]) {
level = docs[0].character.skills[i].level;
}
}
*/
level = docs[0].character.skills.find(skill => skill.id === args[0]).level;
message.reply('Du hast folgenden Talentwert in ' + args[0] + ': ' + level);
const Skill = getSkill({Character: docs[0].character, args: args});
if(!Skill) { return message.reply(findMessage('TALENT_UNKNOWN'));}
return message.reply(`Du hast folgenden Wert in **${Skill.Name}**: ${Skill.Level}`)
}
});
}
@ -34,4 +28,5 @@ module.exports = {
throw e;
}
},
};
};

1
data/dsabot.db
View File

File diff suppressed because one or more lines are too long

20
functions/getSkill.js Normal file
View File

@ -0,0 +1,20 @@
const globals = require('../globals');
const getSkill = ({ Character: Character = [], args: args = [] } = {}) => {
let skill_entry = globals.Talente.find(skill => skill.id.toLowerCase() === args[0].toLowerCase()) ||
globals.Talente.find(skill => skill.name.toLowerCase() === args[0].toLowerCase());
if (!skill_entry) { return; }
let Level = 0; // This is the minimum attributes value.
let cSkill = Character.skills.find(skill => skill.id === skill_entry.id) || {};
if (cSkill) {
Level = cSkill.level || 0;
}
let Name = globals.Talente.find(skill => skill.id === skill_entry.id).name;
return {
Name: Name,
Level: Level
};
};
module.exports = { getSkill };

1
globals.js
View File

@ -126,7 +126,6 @@ const Replies = [
{ id: 'TOO_FEW_ARGS', string: 'Du hast zu wenig Angaben gemacht. Probiere es einmal so:\n'},
{ id: 'SAVED_DATA', string: 'Ich habe deine Daten abgespeichert.'},
{ id: 'DELETED_DATA', string: 'Ich habe deine Daten entfernt.'},
{ id: 'TALENT_UNKNOWN', string: 'Das Talent ist mir unbekannt.'},
{ id: 'NO_SUCH_WEAPON', string: 'Diese Waffe gibt es nicht.'},
{ id: 'COMBAT_CRIT_SUCCESS',string: 'Kritischer Treffer 🎈✨🥳! Der Verteidigungswert deines Gegners halbiert sich!\n'},
{ id: 'COMBAT_CRIT_FAIL', string: 'Patzer 😪! Du erleidest 1W6+2 Schadenspunkte.'},