diff --git a/designs/octoplushy/src/arm.mjs b/designs/octoplushy/src/arm.mjs index 05efede4704..ec7ee60eb98 100644 --- a/designs/octoplushy/src/arm.mjs +++ b/designs/octoplushy/src/arm.mjs @@ -1,7 +1,8 @@ import { headSection1, headSection2 } from './head.mjs' -function octoplushyArmSection(partNumber, part) { - const { +function octoplushyArmSection( + partNumber, + { options, Point, Path, @@ -15,8 +16,9 @@ function octoplushyArmSection(partNumber, part) { macro, utils, store, - } = part.shorthand() - + part, + } +) { if (partNumber > (options.type == 'squid' ? 1 : 0)) { return part } @@ -315,10 +317,10 @@ function octoplushyArmSection(partNumber, part) { export const armSection1 = { name: 'octoplushy.armSection1', after: headSection1, - draft: (part) => octoplushyArmSection(0, part), + draft: (params) => octoplushyArmSection(0, params), } export const armSection2 = { name: 'octoplushy.armSection2', after: headSection2, - draft: (part) => octoplushyArmSection(1, part), + draft: (params) => octoplushyArmSection(1, params), } diff --git a/designs/octoplushy/src/eye.mjs b/designs/octoplushy/src/eye.mjs index f0685069cdf..1c3b9242ae1 100644 --- a/designs/octoplushy/src/eye.mjs +++ b/designs/octoplushy/src/eye.mjs @@ -1,7 +1,8 @@ import { headSection1 } from './head.mjs' -function octoplushyEye(partNumber, part) { - const { +function octoplushyEye( + partNumber, + { options, Point, Path, @@ -14,8 +15,9 @@ function octoplushyEye(partNumber, part) { paperless, macro, store, - } = part.shorthand() - + part, + } +) { if (options.type != 'squid' && options.type != 'octopus') { return part } @@ -133,15 +135,15 @@ function octoplushyEye(partNumber, part) { export const eye1 = { name: 'octoplushy.eye1', after: headSection1, - draft: (part) => octoplushyEye(0, part), + draft: (params) => octoplushyEye(0, params), } export const eye2 = { name: 'octoplushy.eye2', after: headSection1, - draft: (part) => octoplushyEye(1, part), + draft: (params) => octoplushyEye(1, params), } export const eye3 = { name: 'octoplushy.eye3', after: headSection1, - draft: (part) => octoplushyEye(2, part), + draft: (params) => octoplushyEye(2, params), } diff --git a/designs/octoplushy/src/head.mjs b/designs/octoplushy/src/head.mjs index 0a649b5866b..3123c355e8e 100644 --- a/designs/octoplushy/src/head.mjs +++ b/designs/octoplushy/src/head.mjs @@ -1,5 +1,6 @@ -function octoplushyHeadSection(partNumber, part) { - const { +function octoplushyHeadSection( + partNumber, + { options, Point, Path, @@ -13,8 +14,9 @@ function octoplushyHeadSection(partNumber, part) { macro, utils, store, - } = part.shorthand() - + part, + } +) { if (partNumber > (options.type == 'squid' ? 1 : 0)) { return part } @@ -630,10 +632,10 @@ const options = { export const headSection1 = { name: 'octoplushy.headSection1', options, - draft: (part) => octoplushyHeadSection(0, part), + draft: (params) => octoplushyHeadSection(0, params), } export const headSection2 = { name: 'octoplushy.headSection2', options, - draft: (part) => octoplushyHeadSection(1, part), + draft: (params) => octoplushyHeadSection(1, params), }