Skip to content

Apostle Straight check fix #265

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

Open
Pretzal-coatl wants to merge 6 commits into
base: beta
Choose a base branch
from
Open

Apostle Straight check fix #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7e82be4
Fixing straight flush checking
Pretzal-coatl Nov 2, 2025
f3851f4
Rewriting get_straight check
Pretzal-coatl Nov 4, 2025
646d7ba
Special exemptions for Apostle
Pretzal-coatl Nov 5, 2025
197d6fb
Converting to lovely patch
Pretzal-coatl Nov 7, 2025
05765de
Merge remote-tracking branch 'origin/beta' into straight-flush-check-fix
Pretzal-coatl Nov 21, 2025
1a79979
Removing other fix
Pretzal-coatl Nov 21, 2025
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
2 changes: 0 additions & 2 deletions content/rank/apostle.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ SMODS.Rank {
hc_atlas = 'ranks_hc',
pos = { x = 0 },

straight_edge = true,
next = { 'Ace' },
nominal = 12,
face = true,
Expand Down Expand Up @@ -43,6 +42,5 @@ SMODS.Rank {
SMODS.Rank:take_ownership('Ace',
{
next = { '2', 'paperback_Apostle' },
straight_edge = false
}
)
74 changes: 0 additions & 74 deletions lovely/ace_apostle_straights.toml
View file
Open in desktop

This file was deleted.

52 changes: 52 additions & 0 deletions lovely/apostle_fixes.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
[manifest]
version = "1.0.0"
dump_lua = true
priority = 0

[[patches]]
[patches.pattern]
target = '=[SMODS _ "src/overrides.lua"]'
pattern = "local function next_ranks(key, start)"
position = "at"
match_indent = true
payload = '''
local function next_ranks(key, start, from_apostle)
'''

[[patches]]
[patches.pattern]
target = '=[SMODS _ "src/overrides.lua"]'
pattern = "if not start and not wrap and rank.straight_edge then return ret end"
position = "at"
match_indent = true
payload = '''
if not start and not wrap and rank.straight_edge and not from_apostle then
for _, v in ipairs(rank.next) do
if v == 'paperback_Apostle' then
ret[#ret + 1] = v
end
end
return ret
end
if not start and not wrap and key == 'paperback_Apostle' then return ret end
'''

[[patches]]
[patches.pattern]
target = '=[SMODS _ "src/overrides.lua"]'
pattern = "if skip and (wrap or not SMODS.Ranks[v].straight_edge) then"
position = "at"
match_indent = true
payload = '''
if skip and (wrap or (not from_apostle and not SMODS.Ranks[v].straight_edge) or v ~= 'paperback_Apostle') then
'''

[[patches]]
[patches.pattern]
target = '=[SMODS _ "src/overrides.lua"]'
pattern = "for _,l in ipairs(next_ranks(tuple[i-1], i == 2)) do"
position = "at"
match_indent = true
payload = '''
for _,l in ipairs(next_ranks(tuple[i-1], i == 2, tuple[1] == 'paperback_Apostle')) do
'''