miijs 2.2.0 → 2.2.1

package/heightWeightConversion.js

@@ -0,0 +1,123 @@
+// ------------------------------
+// Helpers
+// ------------------------------
+const clamp = (v, min, max) => Math.min(max, Math.max(min, v));
+
+// ------------------------------
+// Height (0..127)  <->  feet/inches
+// Calibrated so height=64 -> 67 inches exactly.
+// Range: 36" (3'0") .. 84" (7'0").
+// ------------------------------
+const HEIGHT_MIN_IN = 36;
+const HEIGHT_MAX_IN = 84;
+const HEIGHT_RANGE_IN = HEIGHT_MAX_IN - HEIGHT_MIN_IN;
+
+// Calibration target: slider mid (64) should be 67"
+const HEIGHT_MID_SLIDER = 64;
+const HEIGHT_MID_IN = 67;
+
+// Compute exponent k so that x0^k = y0 (bias curve, invertible)
+const x0 = HEIGHT_MID_SLIDER / 127;                       // ~0.50394
+const y0 = (HEIGHT_MID_IN - HEIGHT_MIN_IN) / HEIGHT_RANGE_IN; // 31/48 ≈ 0.64583
+const HEIGHT_EXP = Math.log(y0) / Math.log(x0);           // ≈ 0.638 (computed once)
+
+/** 0..127 -> { feet, inches, totalInches } */
+function miiHeightToFeetInches(heightValue) {
+  const hv = clamp(heightValue | 0, 0, 127);
+  const x = hv / 127;
+  const s = Math.pow(x, HEIGHT_EXP); // calibrated bias
+  const inches = HEIGHT_MIN_IN + s * HEIGHT_RANGE_IN;
+
+  const totalInches = Math.round(inches);
+  const feet = Math.floor(totalInches / 12);
+  const inchesR = totalInches % 12;
+
+  return { feet, inches: inchesR, totalInches };
+}
+
+/** inches -> 0..127 (inverse of the calibrated mapping) */
+function inchesToMiiHeight(targetInches) {
+  const y = clamp((targetInches - HEIGHT_MIN_IN) / HEIGHT_RANGE_IN, 0, 1);
+  const x = Math.pow(y, 1 / HEIGHT_EXP);
+  return Math.round(x * 127);
+}
+
+// ------------------------------
+// Weight (0..127) + height(0..127)  <->  pounds
+// Baseline by BMI; composition slider is nonlinear & invertible.
+// Center (64) -> multiplier 1.0.
+// ------------------------------
+const BMI_AVG = 23.5;      // gives ~150 lb at 67"
+const WEIGHT_SPREAD = 0.35; // ±35% around baseline at extremes
+const WEIGHT_GAMMA = 1.6;   // steeper near ends, softer center
+
+/** weight slider + height slider -> pounds */
+function miiWeightToPounds(weightValue, heightValue) {
+  const wv = clamp(weightValue | 0, 0, 127);
+  const hv = clamp(heightValue | 0, 0, 127);
+
+  // Height in inches using the calibrated mapping
+  const { totalInches: H } = miiHeightToFeetInches(hv);
+
+  // BMI baseline
+  const base = (BMI_AVG * H * H) / 703;
+
+  // Nonlinear symmetric multiplier around 1.0 (64 -> 0 offset)
+  const d = clamp((wv - 64) / 63, -1, 1);
+  const multiplier = 1 + Math.sign(d) * WEIGHT_SPREAD * Math.pow(Math.abs(d), WEIGHT_GAMMA);
+
+  return Math.round(base * multiplier);
+}
+
+/** pounds + height slider -> weight slider (inverse of above) */
+function poundsToMiiWeight(pounds, heightValue) {
+  const hv = clamp(heightValue | 0, 0, 127);
+  const { totalInches: H } = miiHeightToFeetInches(hv);
+  const base = (BMI_AVG * H * H) / 703;
+
+  // Guard against tiny numeric drift outside the spread
+  const mult = clamp(pounds / base, 1 - WEIGHT_SPREAD * 1.0001, 1 + WEIGHT_SPREAD * 1.0001);
+
+  let d;
+  if (Math.abs(mult - 1) < 1e-9) {
+    d = 0;
+  } else if (mult > 1) {
+    d = Math.pow((mult - 1) / WEIGHT_SPREAD, 1 / WEIGHT_GAMMA);
+  } else {
+    d = -Math.pow((1 - mult) / WEIGHT_SPREAD, 1 / WEIGHT_GAMMA);
+  }
+
+  const wv = Math.round(64 + 63 * clamp(d, -1, 1));
+  return clamp(wv, 0, 127);
+}
+
+// ------------------------------
+// Quick checks (should match your expectations)
+// ------------------------------
+// Average points
+// console.log(miiHeightToFeetInches(64), miiWeightToPounds(64, 64)); // ~5'7", ~150 lb
+// Extremes
+// console.log(miiHeightToFeetInches(0),   miiWeightToPounds(0, 0));       // 3'0",  ~28 lb
+// console.log(miiHeightToFeetInches(127), miiWeightToPounds(127, 127));   // 7'0", ~318 lb
+// Inverses
+// const h = miiHeightToFeetInches(64);
+// console.log(inchesToMiiHeight(h.totalInches)); // ~64
+// const lbs = miiWeightToPounds(96, 64);
+// console.log(lbs);                              // ~135
+// console.log(poundsToMiiWeight(lbs, 64));       // ~96
+
+
+// ------------------------------
+// Quick sanity checks
+// ------------------------------
+// Average points
+console.log(miiHeightToFeetInches(64), miiWeightToPounds(64, 64)); // ~5'0", ~150 lb
+// // Extremes
+console.log(miiHeightToFeetInches(0), miiWeightToPounds(0, 0));//3'0, 28 lb
+console.log(miiHeightToFeetInches(127), miiWeightToPounds(127, 127));//7'0 318 lb
+// // Inverses
+const h = miiHeightToFeetInches(64);
+console.log(inchesToMiiHeight(h.totalInches)); // ~64
+const lbs = miiWeightToPounds(96, 64);
+console.log(lbs);//168
+console.log(poundsToMiiWeight(lbs, 64)); // ~96

package/index.js

@@ -2179,11 +2179,11 @@ function convertMii(jsonIn,typeTo){
         }
         miiTo.nose.type=convTables.nose3DSToWii[mii.nose.page][mii.nose.type];
         miiTo.mouth.type=convTables.mouth3DSToWii[mii.mouth.page][mii.mouth.type];
-        miiTo.mouth.color=mii.mouth.col>2?0:mii.mouth.col;
+        miiTo.mouth.color=mii.mouth.color>2?0:mii.mouth.color;
         miiTo.hair.type=convTables.hair3DSToWii[mii.hair.page][mii.hair.type];
         miiTo.eyebrows.type=convTables.eyebrows3DSToWii[mii.eyebrows.page][mii.eyebrows.type];
         miiTo.eyes.type=convTables.eyes3DSToWii[mii.eyes.page][mii.eyes.type];
-        miiTo.glasses.col=mii.glasses.col;
+        miiTo.glasses.color=mii.glasses.color;
         if(miiTo.beard.mustache.type===4){
             miiTo.beard.mustache.type=2;
         }
@@ -2211,7 +2211,7 @@ function convertMii(jsonIn,typeTo){
         }
         miiTo.eyes.squash=3;
         miiTo.eyebrows.squash=3;
-        miiTo.mouth.col=mouthCols3DS[mii.mouth.col];//qk
+        miiTo.mouth.color=mii.mouth.color;
         miiTo.mouth.squash=3;
         miiTo.console="3ds";
     }
@@ -3054,7 +3054,7 @@ async function write3DSQR(miiJson, outPath, fflRes = getFFLRes()) {
     main_img.blit(canvas, 212 - 100 / 2, 212 - 100 / 2);
     const font = await Jimp.loadFont(Jimp.FONT_SANS_16_BLACK)
 
-    main_img.print(font, 0, 55, {
+    main_img.print(font, 0, 70, {
         text: miiJson.meta.name,
         alignmentX: Jimp.HORIZONTAL_ALIGN_CENTER,
         alignmentY: Jimp.VERTICAL_ALIGN_MIDDLE
@@ -3077,61 +3077,64 @@ async function write3DSQR(miiJson, outPath, fflRes = getFFLRes()) {
     return imageBuffer;
 }
 function make3DSChild(dad,mom,options={}){
-    if(!["3ds","wii u"].includes(dad.console?.toLowerCase())){
+    if(!["3ds","wii u"].includes(dad.meta.console?.toLowerCase())){
         dad=convertMii(dad,"wii");
     }
-    if(!["3ds","wii u"].includes(mom.console?.toLowerCase())){
+    if(!["3ds","wii u"].includes(mom.meta.console?.toLowerCase())){
         mom=convertMii(dad,"wii");
     }
-    var g=options.gender||Math.floor(Math.random()*2)===1?"Male":"Female";
+    var g=options.gender||Math.floor(Math.random()*2);
     var child={
-        "info":{
+        "general":{
             "birthMonth":new Date().getMonth()+1,
             "birthday":new Date().getDay(),
             "height":64,
             "weight":64,
-            "creatorName":"",
             "gender":g,
-            "name":options.name||kidNames[g][Math.floor(Math.random()*kidNames[g].length)],
             "favColor":options.favColor||favCols[Math.floor(Math.random()*favCols.length)]
         },
+        "meta":{
+            "name":options.name||kidNames[g][Math.floor(Math.random()*kidNames[g].length)],
+            "creatorName":"",
+        },
         "perms":{
             "sharing":true,
             "copying":true
         },
         "hair":{
-            "style":[8,3],//Hardcoded
-            "col":Math.floor(Math.random()*2)===1?dad.hair.col:mom.hair.col,
+            "page":8,//Hardcoded, needs to be generated
+            "type":3,// ^
+            "color":Math.floor(Math.random()*2)===1?dad.hair.color:mom.hair.color,
             "flipped":Math.floor(Math.random()*2)===0?true:false
         },
         "face":{
             "shape":Math.floor(Math.random()*2)===1?dad.face.shape:mom.face.shape,
             "feature":Math.floor(Math.random()*2)===1?dad.face.feature:mom.face.feature,
-            "makeup":g==="Male"?"None":Math.floor(Math.random()*2)===1?dad.face.makeup:mom.face.makeup
+            "makeup":g===0?0:Math.floor(Math.random()*2)===1?dad.face.makeup:mom.face.makeup
         },
         "eyes":Math.floor(Math.random()*2)===1?dad.eyes:mom.eyes,
         "eyebrows":Math.floor(Math.random()*2)===1?dad.eyebrows:mom.eyebrows,
         "nose":Math.floor(Math.random()*2)===1?dad.nose:mom.nose,
         "mouth":Math.floor(Math.random()*2)===1?dad.mouth:mom.mouth,
-        "facialHair":g==="Female"?{
-            "mustacheType": 0,
-            "beardType": 0,
-            "col": "Black",
-            "mustacheSize": 4,
-            "mustacheYPos": 10
-        }:Math.floor(Math.random()*2)===0?dad.facialHair:mom.facialHair,
+        "beard":{//Beards can never be generated for children allegedly, confirm before finishing
+            "mustache":{
+                "type":0,
+                "mustacheSize": 4,
+                "mustacheYPos": 10
+            },
+            "type": 0,
+            "color": 0
+        },
         "glasses":Math.floor(Math.random()*2)===1?dad.glasses:mom.glasses,
-        "mole":Math.floor(Math.random()*2)===1?dad.mole:mom.mole,
-        "creatorName":""
+        "mole":Math.floor(Math.random()*2)===1?dad.mole:mom.mole
     };
-    child.eyebrows.col=child.hair.col;
-    var c=[skinCols.indexOf(mom.face.col),skinCols.indexOf(dad.face.col)];
+    child.eyebrows.color=child.hair.color;
+    var c=[mom.face.color,dad.face.color];
     if(c[0]>c[1]){
         c[1]=c[0];
-        c[0]=skinCols.indexOf(dad.face.col);
+        c[0]=dad.face.color;
     }
-    child.face.col=skinCols[c[0]+Math.round((c[1]-c[0])/2)];
-    child.name=child.info.name;
+    child.face.color=c[0]+Math.round((c[1]-c[0])/2);
     child.type="3DS";
     return child;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "miijs",
-  "version": "2.2.0",
+  "version": "2.2.1",
   "description": "Work with Mii characters in every possible way needed for your project.",
   "main": "index.js",
   "scripts": {