Merge pull request #142 from 24ik/marathon

[bug] marathon

assets/pairs/generate.nim

@@ -5,7 +5,7 @@
 {.experimental: "strictFuncs".}
 {.experimental: "views".}
 
-import std/[os, sequtils, strutils, sugar]
+import std/[os, sequtils, strformat, strutils, sugar]
 
 const
   PairsCount = 65536
@@ -29,9 +29,19 @@ when isMainModule:
     doAssert pairStrs.allIt it.len == 2
 
     let lines = collect:
-      for pairsIdx in 0..<PairsCount:
+      for pairsIdx in 0 ..< PairsCount:
         join pairStrs[pairsIdx * PairCount ..< pairsIdx.succ * PairCount]
     doAssert lines.len == PairsCount
     doAssert lines.allIt it.len == LineLen
 
-    (rawPath /../ "swap.txt").writeFile lines.join "\n"
+    const TripleQuote = '"'.repeat 3
+    let
+      dstPath =
+        currentSourcePath().parentDir.parentDir.parentDir / "src" / "pon2pkg" / "private" /
+        "app" / "marathon" / "pairs.nim"
+      pairsTxt = lines.join "\n"
+    dstPath.writeFile &"""
+# This file is generated by the program, so do not edit it manually.
+const MarathonPairsTextRaw* = {TripleQuote}
+{pairsTxt}{TripleQuote}
+"""

pon2.nimble

@@ -1,6 +1,6 @@
 # Package
 
-version = "0.20.4"
+version = "0.20.5"
 author = "Keisuke Izumiya"
 description = "Application for Puyo Puyo and Nazo Puyo"
 license = "Apache-2.0"

src/pon2pkg/app/marathon.nim

@@ -9,7 +9,7 @@ import std/[algorithm, critbits, math, os, sequtils, strutils, sugar, random]
 import ./[key, simulator]
 import ../core/[cell, field, puyopuyo]
 import ../private/[misc]
-import ../private/app/marathon/[common]
+import ../private/app/marathon/[common, pairs]
 
 type
   MarathonMatchResult* = object ## Matching result.
@@ -27,8 +27,6 @@ type
 
     rng: Rand
 
-const RawPairsTxt = staticRead Pon2RootDir / "assets" / "pairs" / "swap.txt"
-
 using
   self: Marathon
   mSelf: var Marathon
@@ -43,7 +41,7 @@ proc initMarathon*(): Marathon {.inline.} =
   result.simulator.new
   result.simulator[] = initPuyoPuyo[TsuField]().initSimulator Play
 
-  result.allPairsStrs.seq = RawPairsTxt.splitLines
+  result.allPairsStrs.seq = MarathonPairsTextRaw.splitLines
   result.allPairsStrs.tree = result.allPairsStrs.seq.toCritBitTree
   assert result.allPairsStrs.seq.len == AllPairsCount
 

assets/pairs/swap.txt → src/pon2pkg/private/app/marathon/pairs.nim

@@ -1,3 +1,5 @@
+# This file is generated by the program, so do not edit it manually.
+const MarathonPairsTextRaw* = """
 rrrpypypbrbbbppbrryrbbpybpyyprypybrbbbpbppbpyyyppbyppyybbryypyppbpppypyrryypbybpyrbrrbyprbbrrrbbypyprrryyrrbpbbbbyrrppypprrryrrrybrbbbbryrpbprpyypybprrpbpybbyybbyprbrbyyrrrrbbypybpbbypbyrpypryyrpprybrppbyyypyrprprybpbpbpryyprpbyyrrbbrppryybpyyrbrpbrrpbprbr
 pgprppbrpbbgrrrrppprbgbbgpbbrpbrpbrbbbprpgppgggrrbprbrgrppgbggrppprppbrppgbppggrbbprbrbgpbgrpgbbbpgrpgrgbbpgggrprbpbpggpprpggrbpgbprrbpgprgggrrgrbgpbbrbpggbrpbprprgbgrrrrrggggrgbbgrgbrgbgrbbrrggrrbpgpggpgpggrprprgrbgpbpbpgrbbprbpprbgbbbppbbpgbpprbrggrrggbr
 gbbyybgbgpggggpbgppyyypbgbgbpbppyppggybpgypgygbypggygybgpgpgybbybgpyygpybygbpbgpgyggbppbyypggppyypbbypgyyyyppbyggppbgpbpbbpbgygbbgppbyppppybbgygpyggbpgpbyyygpbbgbpbgbbgygybyyyygypybbgybgypbbypbyybbgygbyggpbpbgbyyyyppyygbbppggygppbygbgggybpbgypbpppbgypypbpy
@@ -65533,4 +65535,4 @@ ybybgrrggyygyyrgbrgrbgrrbygbyrrggggygbygrybgrgybyrrgrbgrbbyybrrgbygbyyryrgggrbbb
 ggprpgyprrgrpggyppgpyyppypygprgyggypygypggyrrggggyrrgyprrpggrrpprrpyrrppypgpgggprgrgrrrygyyprryrygpygrrggpyyyrygprgpprppgyypyggrgrgpryppgppgyyppyprprpgyprygggprgyypyrppppygrgrprrygyrrrypyppygygprgyyygrpypyyrygpgrpryrppyyrgrgggyggpryyrypyrygggpygypgrrrrrrrr
 yrrbgyyrbbgryryryrbrbbgrgggyyyrrgbrbyrbyryygyygybgbyybgrggygbyrgrrgyyybbbbbrgrrggyrgggygrygrrbybyyybybbbbrybgrbygygrrrrrrbgggryrggbbygrrrggbybbbgybbrgygrgrgbgyryrrgrybybygyrgbbygybgbbgygrrggyrbgbgrrggrbgrggbygbbybrbrggrrryybbbyybrgryybrgyyyrygbygbrybbrrbrb
 pbgbgpygypgbgbpgppyygbbppbgbypbgpbypgybbgybpppbbbpbbpggbbggggyybbbgygbypypbbybyypbpbpypggpyygpygpybbypgybppbppggggyyybbgbpbpgyppyyggpgygpyppyppbybpbbbypgbypbppgpygbgpyybgyypybygyggyyggbbbggybgppgbbbgpgggbbpgygpbbygypgbpgypgbpygggpybbpgyypbpgppybygpbyyybyyg
-yryyprgprrgprgrpprgyppgygyryrrgrrgrpyygyyygprrryyrrgryrgpgyyryryrppypygryrpypyrgrpyyrpyyggyprpgryggprpgypygygrpyppryppyypggrgpygygrgrgyggppygpggyyrrpgyyppgrpryyrppgggypgrrrgrypgprypggrppgyprrrrprppyrypryrrprppgrggppggppyrryyygggprgygggpyryyrggppryyggppyrgy
+yryyprgprrgprgrpprgyppgygyryrrgrrgrpyygyyygprrryyrrgryrgpgyyryryrppypygryrpypyrgrpyyrpyyggyprpgryggprpgypygygrpyppryppyypggrgpygygrgrgyggppygpggyyrrpgyyppgrpryyrppgggypgrrrgrypgprypggrppgyprrrrprppyrypryrrprppgrggppggppyrryyygggprgygggpyryyrggppryyggppyrgy"""