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

FC18: Updated missing sparkler flame smoke naming to convention

Browse source
This commit is contained in:
Willem Cazander 2025-09-06 11:50:33 +02:00
parent d1064dd22d
commit 0f9e5fcc6d
3 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

16
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/FourCornerZionStenoLexer.java
View file

@ -142,7 +142,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
} }
if (cakeSlice.name().startsWith("FC_BA2I") && cakeSlice.name().endsWith("_BANK")) { if (cakeSlice.name().startsWith("FC_BA2I") && cakeSlice.name().endsWith("_BANK")) {
FourCornerDotCake cakeSliceSel = FourCornerDotCake.valueOf(cakeSlice.ordinal() - 1); FourCornerDotCake cakeSliceSel = FourCornerDotCake.valueOf(cakeSlice.ordinal() - 1);
CAKE_SLICE_EATERS.add(new StenoScannerNumberBase2Int(cakeSliceSel, cakeSlice, fremanBase2IntItr.next())); CAKE_SLICE_EATERS.add(new StenoScannerNumberBase2Signed(cakeSliceSel, cakeSlice, fremanBase2IntItr.next()));
continue; continue;
} }
if (cakeSlice.name().startsWith("FC_BA8L") && cakeSlice.name().endsWith("_BANK")) { if (cakeSlice.name().startsWith("FC_BA8L") && cakeSlice.name().endsWith("_BANK")) {
@ -425,12 +425,12 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
} }
} }
static final class StenoScannerNumberBase2Int extends StenoScannerNumberBank { static final class StenoScannerNumberBase2Signed extends StenoScannerNumberBank {
private final FCFlameFremanSignedBase2 numberFreman; private final FCFlameFremanSignedBase2 numberFreman;
public StenoScannerNumberBase2Int(FourCornerDotCake cakeSliceSel, FourCornerDotCake cakeSliceBank, FCFlameFremanSignedBase2 numberFreman) { public StenoScannerNumberBase2Signed(FourCornerDotCake cakeSliceSel, FourCornerDotCake cakeSliceBank, FCFlameFremanSignedBase2 numberFreman) {
super(cakeSliceSel, cakeSliceBank, numberFreman.bytes(), FCFlameNumberSparklerSmoke.BASE2_INT); super(cakeSliceSel, cakeSliceBank, numberFreman.bytes(), FCFlameNumberSparklerSmoke.BASE2_SIGNED);
this.numberFreman = numberFreman; this.numberFreman = numberFreman;
} }
@ -541,7 +541,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
static final class StenoScannerNumberChocoPigRational extends StenoScannerNumberBank { static final class StenoScannerNumberChocoPigRational extends StenoScannerNumberBank {
public StenoScannerNumberChocoPigRational() { public StenoScannerNumberChocoPigRational() {
super(FourCornerDotCake.FC_RATIONAL2304_SEL0, FourCornerDotCake.FC_RATIONAL2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_RATIONAL); super(FourCornerDotCake.FC_RATIONAL2304_SEL0, FourCornerDotCake.FC_RATIONAL2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_PIG_RATIONAL);
} }
@Override @Override
@ -558,7 +558,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
static final class StenoScannerNumberChocoPigDecimal extends StenoScannerNumberBank { static final class StenoScannerNumberChocoPigDecimal extends StenoScannerNumberBank {
public StenoScannerNumberChocoPigDecimal() { public StenoScannerNumberChocoPigDecimal() {
super(FourCornerDotCake.FC_DECIMAL2304_SEL0, FourCornerDotCake.FC_DECIMAL2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_DECIMAL); super(FourCornerDotCake.FC_DECIMAL2304_SEL0, FourCornerDotCake.FC_DECIMAL2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_PIG_DECIMAL);
} }
@Override @Override
@ -575,7 +575,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
static final class StenoScannerNumberChocoPigFloat extends StenoScannerNumberBank { static final class StenoScannerNumberChocoPigFloat extends StenoScannerNumberBank {
public StenoScannerNumberChocoPigFloat() { public StenoScannerNumberChocoPigFloat() {
super(FourCornerDotCake.FC_FLOAT2304_SEL0, FourCornerDotCake.FC_FLOAT2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_FLOAT); super(FourCornerDotCake.FC_FLOAT2304_SEL0, FourCornerDotCake.FC_FLOAT2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_PIG_FLOAT);
} }
@Override @Override
@ -592,7 +592,7 @@ public class FourCornerZionStenoLexer implements FourCornerZionStenoPetroglyphs
static final class StenoScannerNumberChocoPigChoped extends StenoScannerNumberBank { static final class StenoScannerNumberChocoPigChoped extends StenoScannerNumberBank {
public StenoScannerNumberChocoPigChoped() { public StenoScannerNumberChocoPigChoped() {
super(FourCornerDotCake.FC_CHOPED2304_SEL0, FourCornerDotCake.FC_CHOPED2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_FIXED); super(FourCornerDotCake.FC_CHOPED2304_SEL0, FourCornerDotCake.FC_CHOPED2304_BANK, NCR_BANK12_SIZE, FCFlameNumberSparklerSmoke.CHOCO_PIG_CHOPED);
} }
@Override @Override

10
nx01-x4o-fc18/src/main/java/org/x4o/fc18/zion7/flame4/FCFlameNumberSparklerSmoke.java
View file

@ -29,14 +29,14 @@ package org.x4o.fc18.zion7.flame4;
public enum FCFlameNumberSparklerSmoke { public enum FCFlameNumberSparklerSmoke {
BASE2_LEGO, BASE2_LEGO,
BASE2_INT, BASE2_SIGNED,
BASE8_LEGO, BASE8_LEGO,
BASE8_CHOCO, BASE8_CHOCO,
CHOCO_RATIONAL, CHOCO_PIG_RATIONAL,
CHOCO_DECIMAL, CHOCO_PIG_DECIMAL,
CHOCO_FLOAT, CHOCO_PIG_FLOAT,
CHOCO_FIXED, CHOCO_PIG_CHOPED,
; ;
private static final FCFlameNumberSparklerSmoke[] VALUES = values(); private static final FCFlameNumberSparklerSmoke[] VALUES = values();

4
nx01-x4o-fc18/src/test/java/org/x4o/fc18/zion7/FourCornerZionStenoLexerSmokeTest.java
View file

@ -50,7 +50,7 @@ public class FourCornerZionStenoLexerSmokeTest {
Assertions.assertEquals(0, smokeReader.pipeSmokeClouds); Assertions.assertEquals(0, smokeReader.pipeSmokeClouds);
lexer.read(cdc); lexer.read(cdc);
Assertions.assertEquals(1, smokeReader.pipeSmokeClouds); Assertions.assertEquals(1, smokeReader.pipeSmokeClouds);
Assertions.assertEquals("burnNumberMissingSparkler:CHOCO_RATIONAL", smokeReader.pipeError); Assertions.assertEquals("burnNumberMissingSparkler:CHOCO_PIG_RATIONAL", smokeReader.pipeError);
cdc.addAll(FCDotDEC2701DashPX0.ESC_STOP.baklavaPointSequence()); cdc.addAll(FCDotDEC2701DashPX0.ESC_STOP.baklavaPointSequence());
cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart() + 123); cdc.add(FourCornerDotCake.FC_RATIONAL2304_SEL0.getStart() + 123);
@ -66,7 +66,7 @@ public class FourCornerZionStenoLexerSmokeTest {
cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart()); cdc.add(FourCornerDotCake.FC_RATIONAL2304_BANK.getStart());
smokeReader.reset(); smokeReader.reset();
lexer.read(cdc); lexer.read(cdc);
String res = "[0:1:burnNumberMissingSparkler:CHOCO_RATIONAL][0:8:burnNumberMissingSparkler:CHOCO_RATIONAL][0:16:burnNumberMissingSparkler:CHOCO_RATIONAL]"; String res = "[0:1:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL][0:8:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL][0:16:burnNumberMissingSparkler:CHOCO_PIG_RATIONAL]";
Assertions.assertEquals(res, FourCornerUnicodeDisplay.text().renderFromInt18(cdc)); Assertions.assertEquals(res, FourCornerUnicodeDisplay.text().renderFromInt18(cdc));
} }
} }