feat(simone): Ported Brian's s3 and simons new yoke options

packages/simone/config/index.js

@@ -3,7 +3,6 @@ import { version } from '../package.json'
 export default {
   name: 'simone',
   version,
-  beta: true,
   design: 'Joost De Cock',
   code: 'Joost De Cock',
   department: 'tops',
@@ -20,7 +19,7 @@ export default {
       'sleeveLengthBonus',
       'waistEase',
       'hipsEase',
-      'yokeDart',
+      'roundBack',
     ],
     style: [
       'splitYoke',
@@ -30,6 +29,9 @@ export default {
       'backDarts',
       'frontDarts',
       'contour',
+      'yokeHeight',
+      's3Collar',
+      's3Armhole',
       {
         closure: [
           'extraTopButton',
@@ -123,7 +125,7 @@ export default {
     'wrist',
   ],
   dependencies: {
-    sleeveBase: ['frontBase', 'backBase'],
+    sleeveBase: ['frontBase', 'backBase', 'back'],
     sleeve: ['sleeveBase', 'front', 'back'],
   },
   inject: {
@@ -136,7 +138,7 @@ export default {
     frontLeft: 'fbaFront',
     buttonPlacket: 'fbaFront',
     buttonholePlacket: 'fbaFront',
-    yoke: 'backBase',
+    yoke: 'back',
     sleeveBase: 'fbaFront',
     sleeve: 'sleeveBase',
   },
@@ -228,8 +230,13 @@ export default {
     hemCurve: { pct: 50, min: 25, max: 100 },
     hipsEase: { pct: 15, min: 10, max: 35 },
     lengthBonus: { pct: 25, min: -4, max: 60 },
+    roundBack: { pct: 0, min: 0, max: 10 },
     shoulderEase: { pct: 2, min: 0, max: 15 },
     shoulderSlopeReduction: { pct: 0, min: 0, max: 8 },
+    yokeHeight: { pct: 55, min: 10, max: 90 },
+    // s3 is short for Shoulder Seam Shift
+    s3Collar: { pct: 0, min: -100, max: 100 },
+    s3Armhole: { pct: 0, min: -100, max: 100 },
     sleevecapEase: { pct: 0, min: 0, max: 5 },
     sleevecapTopFactorX: { pct: 50, min: 25, max: 75 },
     sleevecapTopFactorY: { pct: 100, min: 35, max: 165 },
@@ -253,7 +260,6 @@ export default {
     sleeveLengthBonus: { pct: 0, min: -40, max: 10 },
     sleevePlacketLength: { pct: 25, min: 15, max: 35 },
     waistEase: { pct: 15, min: 10, max: 35 },
-    yokeDart: { pct: 0, min: 0, max: 15 },
     backDartShaping: { pct: 25, min: 5, max: 75 },
     bustDartLength: { pct: 80, min: 50, max: 90 },
     frontDartLength: { pct: 45, min: 30, max: 60 },

packages/simone/src/fba-front.js

@@ -312,9 +312,9 @@ export default (part) => {
     .move(points.armhole)
     .curve(points.armholeCp2, points.armholeHollowCp1, points.armholeHollow)
     .curve(points.armholeHollowCp2, points.armholePitchCp1, points.armholePitch)
-    .curve(points.armholePitchCp2, points.shoulderCp1, points.shoulder)
-    .line(points.neck)
-    .curve(points.neckCp2Front, points.cfNeckCp1, points.cfNeck)
+    .join(paths.frontArmhole)
+    .line(points.s3CollarSplit)
+    .join(paths.frontCollar)
 
   switch (options.hemStyle) {
     case 'baseball':