miijs 1.6.6 → 1.6.8

package/index.js

@@ -1110,13 +1110,13 @@ module.exports={
             const ctx = canvas.getContext('2d');
             ctx.drawImage(img, 0, 0);
             const imageData = ctx.getImageData(0, 0, canvas.width, canvas.height);
-            qrCode = jsQR(imageData.data, imageData.width, imageData.height);
+            qrCode = jsQR(imageData.data, imageData.width, imageData.height).binaryData;
         }
         else{
             qrCode=binOrPath;
         }
         if (qrCode) {
-            var data = decodeAesCcm(new Uint8Array(qrCode.binaryData));
+            var data = decodeAesCcm(new Uint8Array(qrCode));
             fs.writeFileSync("./decryptedTemp.3dMii",Buffer.from(data));
             return Promise.resolve(readMii());
         } else {
@@ -1164,6 +1164,7 @@ module.exports={
         miiBin+=wiiFaceFeatures.indexOf(mii.face.feature).toString(2).padStart(4,"0");
         miiBin+="000";
         if(mii.info.mingle&&mii.info.type==="Special"){
+            mii.info.mingle=false;
             console.error("A Special Mii cannot have Mingle on and still render on the Wii. Turned Mingle off in the output file.");
         }
         miiBin+=mii.info.mingle?"0":"1";
@@ -1179,7 +1180,7 @@ module.exports={
         miiBin+="000000";
         miiBin+=wiiHairCols.indexOf(mii.eyebrows.col).toString(2).padStart(3,"0");
         miiBin+=mii.eyebrows.size.toString(2).padStart(4,"0");
-        miiBin+=(mii.eyebrows.yPos+3).toString(2).padStart(5,"0");
+        miiBin+=mii.eyebrows.yPos.toString(2).padStart(5,"0");
         miiBin+=mii.eyebrows.distApart.toString(2).padStart(4,"0");
         miiBin+=(+getKeyByValue(eyeTable,mii.eyes.type)).toString(2).padStart(6,"0");
         miiBin+="00";
@@ -1202,7 +1203,7 @@ module.exports={
         miiBin+=wiiGlassesCols.indexOf(mii.glasses.col).toString(2).padStart(3,"0");
         miiBin+="0";
         miiBin+=mii.glasses.size.toString(2).padStart(3,"0");
-        miiBin+=mii.glasses.yPos.toString(2).padStart(5,"0");
+        miiBin+=(mii.glasses.yPos-3).toString(2).padStart(5,"0");
         miiBin+=mii.facialHair.mustacheType.toString(2).padStart(2,"0");
         miiBin+=mii.facialHair.beardType.toString(2).padStart(2,"0");
         miiBin+=wiiHairCols.indexOf(mii.facialHair.col).toString(2).padStart(3,"0");
@@ -1229,8 +1230,7 @@ module.exports={
         for(var i=0;i<toWrite.length;i++){
             buffers.push(parseInt(toWrite[i],2));
         }
-        const buffer = Buffer.from(buffers);
-        fs.writeFileSync(outPath, buffer);
+        fs.writeFileSync(outPath, Buffer.from(buffers));
     },
     write3DSQR:function(jsonIn,outPath){
         var mii=jsonIn;
@@ -1638,7 +1638,7 @@ module.exports={
                 miiTo.facialHair.mustacheType=0;
                 miiTo.facialHair.beardType=1;
             }
-            if(mii.facialHair.beardType>4){
+            if(mii.facialHair.beardType>3){
                 mii.facialHair.beardType=3;
             }
         }
@@ -1756,7 +1756,7 @@ module.exports={
                 "col": "Black",
                 "mustacheSize": 4,
                 "mustacheYPos": 10
-            }:dad.facialHair,
+            }:Math.floor(Math.random()*2)===0?dad.facialHair:mom.facialHair,
             "glasses":Math.floor(Math.random()*2)===1?dad.glasses:mom.glasses,
             "mole":Math.floor(Math.random()*2)===1?dad.mole:mom.mole,
             "creatorName":""

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miijs",
-  "version": "1.6.6",
+  "version": "1.6.8",
   "description": "Read, Edit, Write, and make Special Miis from a Wiimote binary file or 3DS QR Code to a binary file or QR code",
   "main": "index.js",
   "scripts": {