Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[bug] marathon #142

Merged
merged 1 commit into from
Sep 30, 2024
Merged

[bug] marathon #142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions assets/pairs/generate.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
{.experimental: "strictFuncs".}
{.experimental: "views".}

import std/[os, sequtils, strutils, sugar]
import std/[os, sequtils, strformat, strutils, sugar]

const
PairsCount = 65536
Expand All @@ -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}
"""
2 changes: 1 addition & 1 deletion pon2.nimble
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down
6 changes: 2 additions & 4 deletions src/pon2pkg/app/marathon.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -27,8 +27,6 @@ type

rng: Rand

const RawPairsTxt = staticRead Pon2RootDir / "assets" / "pairs" / "swap.txt"

using
self: Marathon
mSelf: var Marathon
Expand All @@ -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

Expand Down
4 changes: 3 additions & 1 deletion assets/pairs/swap.txt → src/pon2pkg/private/app/marathon/pairs.nim
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
# This file is generated by the program, so do not edit it manually.
const MarathonPairsTextRaw* = """
rrrpypypbrbbbppbrryrbbpybpyyprypybrbbbpbppbpyyyppbyppyybbryypyppbpppypyrryypbybpyrbrrbyprbbrrrbbypyprrryyrrbpbbbbyrrppypprrryrrrybrbbbbryrpbprpyypybprrpbpybbyybbyprbrbyyrrrrbbypybpbbypbyrpypryyrpprybrppbyyypyrprprybpbpbpryyprpbyyrrbbrppryybpyyrbrpbrrpbprbr
pgprppbrpbbgrrrrppprbgbbgpbbrpbrpbrbbbprpgppgggrrbprbrgrppgbggrppprppbrppgbppggrbbprbrbgpbgrpgbbbpgrpgrgbbpgggrprbpbpggpprpggrbpgbprrbpgprgggrrgrbgpbbrbpggbrpbprprgbgrrrrrggggrgbbgrgbrgbgrbbrrggrrbpgpggpgpggrprprgrbgpbpbpgrbbprbpprbgbbbppbbpgbpprbrggrrggbr
gbbyybgbgpggggpbgppyyypbgbgbpbppyppggybpgypgygbypggygybgpgpgybbybgpyygpybygbpbgpgyggbppbyypggppyypbbypgyyyyppbyggppbgpbpbbpbgygbbgppbyppppybbgygpyggbpgpbyyygpbbgbpbgbbgygybyyyygypybbgybgypbbypbyybbgygbyggpbpbgbyyyyppyygbbppggygppbygbgggybpbgypbpppbgypypbpy
Expand Down Expand Up @@ -65533,4 +65535,4 @@ ybybgrrggyygyyrgbrgrbgrrbygbyrrggggygbygrybgrgybyrrgrbgrbbyybrrgbygbyyryrgggrbbb
ggprpgyprrgrpggyppgpyyppypygprgyggypygypggyrrggggyrrgyprrpggrrpprrpyrrppypgpgggprgrgrrrygyyprryrygpygrrggpyyyrygprgpprppgyypyggrgrgpryppgppgyyppyprprpgyprygggprgyypyrppppygrgrprrygyrrrypyppygygprgyyygrpypyyrygpgrpryrppyyrgrgggyggpryyrypyrygggpygypgrrrrrrrr
yrrbgyyrbbgryryryrbrbbgrgggyyyrrgbrbyrbyryygyygybgbyybgrggygbyrgrrgyyybbbbbrgrrggyrgggygrygrrbybyyybybbbbrybgrbygygrrrrrrbgggryrggbbygrrrggbybbbgybbrgygrgrgbgyryrrgrybybygyrgbbygybgbbgygrrggyrbgbgrrggrbgrggbygbbybrbrggrrryybbbyybrgryybrgyyyrygbygbrybbrrbrb
pbgbgpygypgbgbpgppyygbbppbgbypbgpbypgybbgybpppbbbpbbpggbbggggyybbbgygbypypbbybyypbpbpypggpyygpygpybbypgybppbppggggyyybbgbpbpgyppyyggpgygpyppyppbybpbbbypgbypbppgpygbgpyybgyypybygyggyyggbbbggybgppgbbbgpgggbbpgygpbbygypgbpgypgbpygggpybbpgyypbpgppybygpbyyybyyg
yryyprgprrgprgrpprgyppgygyryrrgrrgrpyygyyygprrryyrrgryrgpgyyryryrppypygryrpypyrgrpyyrpyyggyprpgryggprpgypygygrpyppryppyypggrgpygygrgrgyggppygpggyyrrpgyyppgrpryyrppgggypgrrrgrypgprypggrppgyprrrrprppyrypryrrprppgrggppggppyrryyygggprgygggpyryyrggppryyggppyrgy
yryyprgprrgprgrpprgyppgygyryrrgrrgrpyygyyygprrryyrrgryrgpgyyryryrppypygryrpypyrgrpyyrpyyggyprpgryggprpgypygygrpyppryppyypggrgpygygrgrgyggppygpggyyrrpgyyppgrpryyrppgggypgrrrgrypgprypggrppgyprrrrprppyrypryrrprppgrggppggppyrryyygggprgygggpyryyrggppryyggppyrgy"""
Loading