arch-jedi/nx01
1
Fork 0
Code Issues Pull requests Releases Packages Activity Actions

Fixed ESC68_2PIE pie towers with elevator buttons

Browse source
This commit is contained in:
Willem Cazander 2025-05-24 18:08:56 +02:00
parent a3a3350e08
commit 9c1ff8522e
33 changed files with 81 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/FourCornerDotCake.java
View file

@ -487,9 +487,9 @@ public enum FourCornerDotCake {
}
public static Optional<FourCornerDotCake> valueFromCakePoint(final int cakePoint) {
final int valuesLength = VALUES.length;
final int valuesLength = valuesLength();
for (int i = 0; i < valuesLength; i++) {
FourCornerDotCake cake = VALUES[i];
FourCornerDotCake cake = valueOf(i);
if (cake.contains(cakePoint)) {
return Optional.of(cake);
}
@ -499,9 +499,9 @@ public enum FourCornerDotCake {
static public List<FourCornerDotCake> valuesByTower(final FourCornerDotCakeTower tower) {
final List<FourCornerDotCake> result = new ArrayList<>();
final int valuesLength = VALUES.length;
final int valuesLength = valuesLength();
for (int i = 0; i < valuesLength; i++) {
FourCornerDotCake cake = VALUES[i];
FourCornerDotCake cake = valueOf(i);
if (cake.tower().equals(tower)) {
result.add(cake);
}

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash01.java
View file

@ -47,7 +47,7 @@ public enum FCDotPIE9CDash01 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX01_A, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY01_AT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash02.java
View file

@ -48,7 +48,7 @@ public enum FCDotPIE9CDash02 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX02_B, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY02_BAR_V_RIGHT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash03.java
View file

@ -49,7 +49,7 @@ public enum FCDotPIE9CDash03 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX03_C, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY03_BAR_V_LEFT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash04.java
View file

@ -50,7 +50,7 @@ public enum FCDotPIE9CDash04 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX04_D, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY04_BAR_UNDER, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash05.java
View file

@ -51,7 +51,7 @@ public enum FCDotPIE9CDash05 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX05_E, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY05_BAR_VERTICAL, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash06.java
View file

@ -52,7 +52,7 @@ public enum FCDotPIE9CDash06 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX06_F, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY06_PERCENT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash07.java
View file

@ -53,7 +53,7 @@ public enum FCDotPIE9CDash07 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX07_G, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY07_DOLLAR, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash08.java
View file

@ -54,7 +54,7 @@ public enum FCDotPIE9CDash08 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX08_H, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY08_HASH, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash09.java
View file

@ -55,7 +55,7 @@ public enum FCDotPIE9CDash09 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX09_I, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY09_EQUALS, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash10.java
View file

@ -56,7 +56,7 @@ public enum FCDotPIE9CDash10 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX10_J, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY10_CARET, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash11.java
View file

@ -57,7 +57,7 @@ public enum FCDotPIE9CDash11 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX11_K, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY11_BACKTICK, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash12.java
View file

@ -58,7 +58,7 @@ public enum FCDotPIE9CDash12 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX12_L, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY12_QUOTATION, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash13.java
View file

@ -59,7 +59,7 @@ public enum FCDotPIE9CDash13 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX13_M, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY13_APOSTROPHE, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash14.java
View file

@ -60,7 +60,7 @@ public enum FCDotPIE9CDash14 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX14_N, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY14_SEMICOLON, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash15.java
View file

@ -61,7 +61,7 @@ public enum FCDotPIE9CDash15 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX15_O, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY15_COLON, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash16.java
View file

@ -62,7 +62,7 @@ public enum FCDotPIE9CDash16 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX16_P, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY16_DOT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash17.java
View file

@ -63,7 +63,7 @@ public enum FCDotPIE9CDash17 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX17_Q, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY17_COMMA, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash18.java
View file

@ -65,7 +65,7 @@ public enum FCDotPIE9CDash18 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX18_R, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY18_ASTERISK, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash19.java
View file

@ -65,7 +65,7 @@ public enum FCDotPIE9CDash19 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX19_S, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY19_MINUS, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash20.java
View file

@ -66,7 +66,7 @@ public enum FCDotPIE9CDash20 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX20_T, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY20_PLUS, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash21.java
View file

@ -67,7 +67,7 @@ public enum FCDotPIE9CDash21 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX21_U, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY21_TILDE, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash22.java
View file

@ -68,7 +68,7 @@ public enum FCDotPIE9CDash22 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX22_V, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY22_CURLY_RIGHT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash23.java
View file

@ -69,7 +69,7 @@ public enum FCDotPIE9CDash23 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX23_W, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY23_CURLY_LEFT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash24.java
View file

@ -70,7 +70,7 @@ public enum FCDotPIE9CDash24 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX24_X, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY24_ROUND_RIGHT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash25.java
View file

@ -73,7 +73,7 @@ public enum FCDotPIE9CDash25 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX25_Y, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY25_ROUND_LEFT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash26.java
View file

@ -75,7 +75,7 @@ public enum FCDotPIE9CDash26 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX26_Z, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY26_SQUARE_RIGHT, ordinal());
}
@Override

2
nx01-x4o-fc18/src/main/java/org/x4o/fc18/cake2/pie9c/FCDotPIE9CDash27.java
View file

@ -73,7 +73,7 @@ public enum FCDotPIE9CDash27 implements FourCornerDotCollePie9 {
@Override
public List<Integer> baklavaPointSequence() {
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NX27_AMP, ordinal());
return baklavaPointsPIE9C(FCDotCDC1604DashP6.NY27_SQUARE_LEFT, ordinal());
}
@Override