Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Y
ygopro
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Packages
Packages
List
Container Registry
Analytics
Analytics
CI / CD
Code Review
Insights
Issues
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nanahira
ygopro
Commits
9592567c
Commit
9592567c
authored
Sep 23, 2025
by
nanahira
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fix deck_con credit
parent
2326c4c5
Pipeline
#40710
failed with stages
in 29 minutes and 9 seconds
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
25 additions
and
17 deletions
+25
-17
gframe/deck_con.cpp
gframe/deck_con.cpp
+25
-17
No files found.
gframe/deck_con.cpp
View file @
9592567c
...
@@ -1932,28 +1932,36 @@ bool DeckBuilder::check_limit(code_pointer pointer) {
...
@@ -1932,28 +1932,36 @@ bool DeckBuilder::check_limit(code_pointer pointer) {
auto
flit
=
filterList
->
content
.
find
(
limitcode
);
auto
flit
=
filterList
->
content
.
find
(
limitcode
);
if
(
flit
!=
filterList
->
content
.
end
())
if
(
flit
!=
filterList
->
content
.
end
())
limit
=
flit
->
second
;
limit
=
flit
->
second
;
auto
remaining_credits
=
filterList
->
credit_limits
;
std
::
unordered_map
<
std
::
wstring
,
uint32_t
>
credit_used
;
auto
limitcode_credit_it
=
filterList
->
credits
.
find
(
limitcode
);
auto
spend_credit
=
[
&
](
uint32_t
code
)
{
auto
code_credit_it
=
filterList
->
credits
.
find
(
code
);
if
(
code_credit_it
==
filterList
->
credits
.
end
())
return
true
;
auto
code_credit
=
code_credit_it
->
second
;
auto
valid
=
true
;
for
(
auto
&
credit_it
:
code_credit
)
{
auto
key
=
credit_it
.
first
;
auto
credit_limit_it
=
filterList
->
credit_limits
.
find
(
key
);
if
(
credit_limit_it
==
filterList
->
credit_limits
.
end
())
continue
;
auto
credit_limit
=
credit_limit_it
->
second
;
if
(
credit_used
.
find
(
key
)
==
credit_used
.
end
())
credit_used
[
key
]
=
0
;
auto
credit_after
=
credit_used
[
key
]
+
credit_it
.
second
;
if
(
credit_after
>
credit_limit
)
valid
=
false
;
credit_used
[
key
]
=
credit_after
;
}
return
valid
;
};
auto
handle_card
=
[
&
](
ygo
::
code_pointer
&
card
)
{
auto
handle_card
=
[
&
](
ygo
::
code_pointer
&
card
)
{
if
(
card
->
first
==
limitcode
||
card
->
second
.
alias
==
limitcode
)
{
if
(
card
->
first
==
limitcode
||
card
->
second
.
alias
==
limitcode
)
{
limit
--
;
limit
--
;
if
(
limit
<=
0
)
if
(
limit
<=
0
)
return
false
;
return
false
;
if
(
limitcode_credit_it
!=
filterList
->
credits
.
end
())
{
auto
limitcode_credits
=
limitcode_credit_it
->
second
;
for
(
auto
&
credit
:
limitcode_credits
)
{
auto
key
=
credit
.
first
;
auto
remaining_credit_it
=
remaining_credits
.
find
(
key
);
if
(
remaining_credit_it
!=
remaining_credits
.
end
())
{
auto
value
=
credit
.
second
;
auto
remaining_credit
=
remaining_credit_it
->
second
;
if
(
remaining_credit
<
value
)
return
false
;
remaining_credits
[
key
]
-=
value
;
}
}
}
}
}
auto
code
=
card
->
second
.
alias
?
card
->
second
.
alias
:
card
->
first
;
spend_credit
(
code
);
return
true
;
return
true
;
};
};
for
(
auto
&
card
:
deckManager
.
current_deck
.
main
)
{
for
(
auto
&
card
:
deckManager
.
current_deck
.
main
)
{
...
@@ -1968,6 +1976,6 @@ bool DeckBuilder::check_limit(code_pointer pointer) {
...
@@ -1968,6 +1976,6 @@ bool DeckBuilder::check_limit(code_pointer pointer) {
if
(
!
handle_card
(
card
))
if
(
!
handle_card
(
card
))
return
false
;
return
false
;
}
}
return
true
;
return
spend_credit
(
limitcode
)
;
}
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment