From 2b56dc022ea3c2f92c98ff0075ef2e64a11fc7dd Mon Sep 17 00:00:00 2001 From: Jyhy45 Date: Thu, 2 Mar 2023 15:25:03 +0200 Subject: [PATCH 1/2] TrapUpgrades::canonical updated for 5.9... missing 2 upgrades still. --- spirelayout.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/spirelayout.cpp b/spirelayout.cpp index 5b7d483..3641d3b 100644 --- a/spirelayout.cpp +++ b/spirelayout.cpp @@ -105,8 +105,10 @@ const TrapUpgrades TrapUpgrades::canonical[] = { 8, 7, 7, 5 }, // z650 { 8, 7, 7, 6 }, // z675 { 8, 7, 8, 6 }, // z700 - { 8, 8, 8, 6 }, // z730 - { 8, 8, 9, 6 }, // z750 + { 8, 8, 8, 6 }, // z??? + { 8, 8, 9, 6 }, // z??? + { 9, 8, 9, 7 }, // z730 + { 10, 8, 9, 7 }, // z750 { 0, 0, 0, 0} }; From 163b5c342ab406b0afdb417c66353f5c91ee4ed3 Mon Sep 17 00:00:00 2001 From: Jyhy45 Date: Thu, 2 Mar 2023 16:02:22 +0200 Subject: [PATCH 2/2] Actual changes to trap level orders in 5.9 --- spirelayout.cpp | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/spirelayout.cpp b/spirelayout.cpp index 3641d3b..ff5e067 100644 --- a/spirelayout.cpp +++ b/spirelayout.cpp @@ -102,11 +102,10 @@ const TrapUpgrades TrapUpgrades::canonical[] = { 7, 6, 6, 5 }, // z600 { 7, 6, 7, 5 }, // z625 { 7, 7, 7, 5 }, // z630 - { 8, 7, 7, 5 }, // z650 - { 8, 7, 7, 6 }, // z675 - { 8, 7, 8, 6 }, // z700 - { 8, 8, 8, 6 }, // z??? - { 8, 8, 9, 6 }, // z??? + { 8, 7, 8, 5 }, // z650 + { 8, 7, 8, 6 }, // z675 + { 9, 7, 9, 6 }, // z700 + { 9, 7, 9, 7 }, // z725 { 9, 8, 9, 7 }, // z730 { 10, 8, 9, 7 }, // z750 { 0, 0, 0, 0}