night0721/nyx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

319/817 39%

Browse source
This commit is contained in:
night0721 2022-02-03 19:21:05 +08:00
parent 44bc2865f3
commit 2cac998d50
1 changed files with 14 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
util/functions/common.js
View file

@ -211,9 +211,9 @@ function attachmentsIdentifier(inpmsg, gun) {
splitAttachmentsDataName[i][j].Simplify(); splitAttachmentsDataName[i][j].Simplify();
} }
} }
// after loop: ["stippled", "grip", "tape"] // inputAttachmentsNames = [["stippled", "grip", "tape"]
for (let i = 0; i < inputAttachmentsNames.length; i++) { for (let i = 0; i < inputAttachmentsNames.length; i++) {
const probables = []; let probables = [];
// loop through all the input attachments and split them into words // loop through all the input attachments and split them into words
var splitInputAttachmentsName = inputAttachmentsNames[i] var splitInputAttachmentsName = inputAttachmentsNames[i]
.split(" ") .split(" ")
@ -279,22 +279,25 @@ function attachmentsIdentifier(inpmsg, gun) {
probables[probables.length - 1].length !== 1 || probables[probables.length - 1].length !== 1 ||
probables.length < splitInputAttachmentsName.length probables.length < splitInputAttachmentsName.length
) { ) {
// empty probables as can't indentify the attachment
probables = []; probables = [];
// the splitInputAttachmentsName isn't simplified pls rmb // the splitInputAttachmentsName isn't simplified pls rmb
splitInputAttachmentsName.map((x, i5) => splitInputAttachmentsName.map((x, i5) => {
// finding aliases // finding aliases
nmDt.attachmentAlliasName[1].map((y, i6) => nmDt.attachmentAlliasName[1].map((y, i6) => {
y.map(z => { y.map(z => {
if (x.Simplify() === z.Simplify()) { if (z.Simplify().includes(x.Simplify())) {
splitInputAttachmentsName[i5] = nmDt.attachmentActualName[1][i6]; splitInputAttachmentsName[i5] = nmDt.attachmentActualName[1][i6];
} }
}) });
) });
); });
// simple iteration to make the array again
splitInputAttachmentsName = splitInputAttachmentsName splitInputAttachmentsName = splitInputAttachmentsName
.join(" ") .join(" ")
.split(" ") .split(" ")
.filter(x => x); .filter(x => x);
// find one more time as we do aliases already
finder(); finder();
if ( if (
probables.length === 0 || probables.length === 0 ||
@ -308,12 +311,12 @@ function attachmentsIdentifier(inpmsg, gun) {
finder(); finder();
} }
} }
if (probables.length === 0) { if (probables.length === 0) {
// push to unidentifined list as can't be identified after serveral times
unidentifined.push(inputAttachmentsNames[i]); unidentifined.push(inputAttachmentsNames[i]);
continue; continue;
} }
// curr is the most probable attachment
var curr = probables[probables.length - 1]; var curr = probables[probables.length - 1];
const temp1 = probables[probables.length - 1].filter( const temp1 = probables[probables.length - 1].filter(
x => gun.aments[x].name.Simplify() == inputAttachmentsNames[i].Simplify() x => gun.aments[x].name.Simplify() == inputAttachmentsNames[i].Simplify()
@ -412,12 +415,7 @@ function attachmentsIdentifier(inpmsg, gun) {
// console.log(attachmentsIdentifier("ak + 5mw lazer", data.cguns[0].aments)); makeError(); // console.log(attachmentsIdentifier("ak + 5mw lazer", data.cguns[0].aments)); makeError();
// console.log(attachmentsIdentifier("117 + 40 round mag", data.cguns[0].aments, data.cguns[0].stats)); makeError(); // console.log(attachmentsIdentifier("117 + 40 round mag", data.cguns[0].aments, data.cguns[0].stats)); makeError();
// console.log(attachmentsIdentifier("117 + rtc muzzle brake, rubberized griptape, tac lazer sight, 40 round mag, no stock", data.cguns[1].aments)); makeError(); // console.log(attachmentsIdentifier("117 + rtc muzzle brake, rubberized griptape, tac lazer sight, 40 round mag, no stock", data.cguns[1].aments)); makeError();
console.log( console.log(attachmentsIdentifier("47 + dsfasdfaz", data.cguns[0]));
attachmentsIdentifier(
"47 + 40 round mag + marksman + stippled + red dot",
data.cguns[0]
)
);
makeError(); makeError();
function damageHandler( function damageHandler(
currDmgs, currDmgs,