Skip to content

Commit 311cd15

Browse files
authored
add filtering OCG/TCG exclusive cards (#3120)
1 parent 7eb86f6 commit 311cd15

4 files changed

Lines changed: 12 additions & 2 deletions

File tree

gframe/deck_con.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1552,7 +1552,11 @@ void DeckBuilder::FilterCards() {
15521552
continue;
15531553
if(filter_lm == 7 && !(data.ot & AVAIL_CUSTOM))
15541554
continue;
1555-
if(filter_lm == 8 && ((data.ot & AVAIL_OCGTCG) != AVAIL_OCGTCG))
1555+
if(filter_lm == 8 && (!(data.ot & AVAIL_OCG) || (data.ot & AVAIL_TCG)))
1556+
continue;
1557+
if(filter_lm == 9 && (!(data.ot & AVAIL_TCG) || (data.ot & AVAIL_OCG)))
1558+
continue;
1559+
if(filter_lm == 10 && ((data.ot & AVAIL_OCGTCG) != AVAIL_OCGTCG))
15561560
continue;
15571561
}
15581562
bool is_target = true;

gframe/drawing.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1205,7 +1205,9 @@ void Game::DrawThumb(const CardDataC* cp, irr::core::vector2di pos, const LFList
12051205
|| (filter_lm == 5 && !(cp->ot & AVAIL_TCG))
12061206
|| (filter_lm == 6 && !(cp->ot & AVAIL_SC))
12071207
|| (filter_lm == 7 && !(cp->ot & AVAIL_CUSTOM))
1208-
|| (filter_lm == 8 && (cp->ot & AVAIL_OCGTCG) != AVAIL_OCGTCG)));
1208+
|| (filter_lm == 8 && !(cp->ot & AVAIL_OCG))
1209+
|| (filter_lm == 9 && !(cp->ot & AVAIL_TCG))
1210+
|| (filter_lm == 10 && (cp->ot & AVAIL_OCGTCG) != AVAIL_OCGTCG)));
12091211
if(filter_lm >= 4) {
12101212
showAvail = avail;
12111213
showNotAvail = !avail;

gframe/game.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -767,6 +767,8 @@ bool Game::Initialize() {
767767
cbLimit->addItem(dataManager.GetSysString(1482));
768768
cbLimit->addItem(dataManager.GetSysString(1483));
769769
cbLimit->addItem(dataManager.GetSysString(1484));
770+
cbLimit->addItem(dataManager.GetSysString(1487));
771+
cbLimit->addItem(dataManager.GetSysString(1488));
770772
cbLimit->addItem(dataManager.GetSysString(1485));
771773
stAttribute = env->addStaticText(dataManager.GetSysString(1319), irr::core::rect<irr::s32>(10, 22 + 50 / 6, 70, 42 + 50 / 6), false, false, wFilter);
772774
cbAttribute = env->addComboBox(irr::core::rect<irr::s32>(60, 20 + 50 / 6, 195, 40 + 50 / 6), wFilter, COMBOBOX_ATTRIBUTE);

strings.conf

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -505,6 +505,8 @@
505505
!system 1484 自定义卡片
506506
!system 1485 无独有卡
507507
!system 1486 所有卡片
508+
!system 1487 OCG独有
509+
!system 1488 TCG独有
508510
!system 1500 决斗结束。
509511
!system 1501 录像结束。
510512
!system 1502 连接已断开。

0 commit comments

Comments
 (0)