From 0e0144433700c95edb18ca44369ef321a3bb74bc Mon Sep 17 00:00:00 2001 From: Willem Cazander Date: Sun, 30 Jan 2022 19:42:26 +0100 Subject: [PATCH] Fixed tone letters unique per set --- .../demo4d/base2t/T06PartSeximal.java | 12 +++---- .../demo4d/base2t/T08PartOctal.java | 17 +++++----- .../demo4d/base2t/T12PartUncial.java | 23 +++++++------ .../demo4d/base2t/T16PartHex.java | 32 +++++++++---------- 4 files changed, 41 insertions(+), 43 deletions(-) diff --git a/core/src/love/distributedrebirth/demo4d/base2t/T06PartSeximal.java b/core/src/love/distributedrebirth/demo4d/base2t/T06PartSeximal.java index 18ee06d6..9ed39487 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/T06PartSeximal.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/T06PartSeximal.java @@ -21,12 +21,12 @@ import love.distributedrebirth.demo4d.base2t.facet.BasePartSplit6; */ public enum T06PartSeximal implements BaseFacet,BasePartAlt1,BasePartSplit6 { - PART_1("˧˥","0","四","4","A"), - PART_2("˧˩","1","五","5","D"), - PART_3("˨˦","2","六","6","F"), - PART_4("˦˨","3","七","7","G"), - PART_5("˩˧","4","八","8","V"), - PART_6("˥˧","5","九","9","X"), + PART_1("˦","0","四","4","A"), + PART_2("˨","1","五","5","D"), + PART_3("꜓","2","六","6","F"), + PART_4("꜕","3","七","7","G"), + PART_5("꜊","4","八","8","V"), + PART_6("꜏","5","九","9","X"), ; public static int LENGTH = 6; diff --git a/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctal.java b/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctal.java index 7058112d..35c43956 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctal.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/T08PartOctal.java @@ -19,15 +19,14 @@ import love.distributedrebirth.demo4d.base2t.facet.BasePartSplit8; */ public enum T08PartOctal implements BaseFacet,BasePartAlt2,BasePartSplit8 { - // FIXME make 8 tone letters - PART_1("˩","0","心","heart","˧˥˩","˥˩˧", 0), - PART_2("˥","1","頭","head", "˧˩˥","˩˥˧", 3), - PART_3("˦","2","眼","eye", "˧˥˦","˥˦˧", 6), - PART_4("˨","3","嘴","mouth","˧˩˨","˩˨˧", 9), - PART_5("˦","4","臂","arm", "˧˦˦","˦˦˧", 12), - PART_6("˨","5","手","hand", "˧˨˨","˨˨˧", 15), - PART_7("˥","6","肢","leg", "˧˥˥","˥˥˧", 18), - PART_8("˩","7","腳","feet", "˧˩˩","˩˩˧", 21), + PART_1("˥","0","心","heart","˧˥˩","˥˩˧", 0), + PART_2("˩","1","頭","head", "˧˩˥","˩˥˧", 3), + PART_3("꜒","2","眼","eye", "˧˥˦","˥˦˧", 6), + PART_4("꜖","3","嘴","mouth","˧˩˨","˩˨˧", 9), + PART_5("꜈","4","臂","arm", "˧˦˦","˦˦˧", 12), + PART_6("꜌","5","手","hand", "˧˨˨","˨˨˧", 15), + PART_7("꜍","6","肢","leg", "˧˥˥","˥˥˧", 18), + PART_8("꜑","7","腳","feet", "˧˩˩","˩˩˧", 21), ; public static int LENGTH = 8; diff --git a/core/src/love/distributedrebirth/demo4d/base2t/T12PartUncial.java b/core/src/love/distributedrebirth/demo4d/base2t/T12PartUncial.java index 9f266d1f..2ff31079 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/T12PartUncial.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/T12PartUncial.java @@ -18,19 +18,18 @@ import love.distributedrebirth.demo4d.base2t.facet.BasePartAlt1; */ public enum T12PartUncial implements BaseFacet,BasePartAlt1 { - // TODO: fixup tone letters for 12 parts PART_1 ("˥","0","日","sun","0"), - PART_2 ("˥","1","月","moon","1"), - PART_3 ("˥","2","星","star","2"), - PART_4 ("˥","3","山","mountain","3"), - PART_5 ("˥","4","龍","dragon","4"), - PART_6 ("˥","5","鳳","phoenix","5"), - PART_7 ("˥","6","杯","cup","6"), - PART_8 ("˥","7","藻","pondweed","7"), - PART_9 ("˥","8","爐","furnace","8"), - PART_10("˥","9","種","seed","9"), - PART_11("˥","A","黼","axe","\u218a"), // TURNED DIGIT TWO - PART_12("˥","B","亞","nozero","\u218b"), // TURNED DIGIT THREE + PART_2 ("˧","1","月","moon","1"), + PART_3 ("˩","2","星","star","2"), + PART_4 ("꜒","3","山","mountain","3"), + PART_5 ("꜔","4","龍","dragon","4"), + PART_6 ("꜖","5","鳳","phoenix","5"), + PART_7 ("꜈","6","杯","cup","6"), + PART_8 ("꜊","7","藻","pondweed","7"), + PART_9 ("꜌","8","爐","furnace","8"), + PART_10("꜍","9","種","seed","9"), + PART_11("꜏","A","黼","axe","\u218a"), // TURNED DIGIT TWO + PART_12("꜑","B","亞","nozero","\u218b"), // TURNED DIGIT THREE ; public static int LENGTH = 12; diff --git a/core/src/love/distributedrebirth/demo4d/base2t/T16PartHex.java b/core/src/love/distributedrebirth/demo4d/base2t/T16PartHex.java index 06fe5e4e..7559cb02 100644 --- a/core/src/love/distributedrebirth/demo4d/base2t/T16PartHex.java +++ b/core/src/love/distributedrebirth/demo4d/base2t/T16PartHex.java @@ -19,22 +19,22 @@ import love.distributedrebirth.demo4d.base2t.facet.BasePartSplit16; */ public enum T16PartHex implements BaseFacet,BasePartAlt1,BasePartSplit16 { - PART_1 ("˧˥˩","0","氫","hydrogen","1"), - PART_2 ("˧˩˥","1","氦","helium","2"), - PART_3 ("˧˥˦","2","鋰","lithium","3"), - PART_4 ("˧˩˨","3","鈹","beryllium","A"), - PART_5 ("˧˦˦","4","硼","boron","4"), - PART_6 ("˧˨˨","5","碳","carbon","5"), - PART_7 ("˧˥˥","6","氮","nitrogen","6"), - PART_8 ("˧˩˩","7","氧","oxygen","B"), - PART_9 ("˥˩˧","8","氟","fluorine","7"), - PART_10("˩˥˧","9","氖","neon","8"), - PART_11("˥˦˧","A","鈉","sodium","9"), - PART_12("˩˨˧","B","鎂","magnesium","C"), - PART_13("˦˦˧","C","鋁","aluminium","*"), - PART_14("˨˨˧","D","矽","silicon","0"), - PART_15("˥˥˧","E","磷","phosphorus","#"), - PART_16("˩˩˧","F","硫","sulfur","D"), + PART_1 ("˥","0","氫","hydrogen","1"), + PART_2 ("˦","1","氦","helium","2"), + PART_3 ("˨","2","鋰","lithium","3"), + PART_4 ("˩","3","鈹","beryllium","A"), + PART_5 ("꜒","4","硼","boron","4"), + PART_6 ("꜓","5","碳","carbon","5"), + PART_7 ("꜕","6","氮","nitrogen","6"), + PART_8 ("꜖","7","氧","oxygen","B"), + PART_9 ("꜈","8","氟","fluorine","7"), + PART_10("꜉","9","氖","neon","8"), + PART_11("꜋","A","鈉","sodium","9"), + PART_12("꜌","B","鎂","magnesium","C"), + PART_13("꜍","C","鋁","aluminium","*"), + PART_14("꜎","D","矽","silicon","0"), + PART_15("꜐","E","磷","phosphorus","#"), + PART_16("꜑","F","硫","sulfur","D"), ; public static int LENGTH = 16;