Commit 59c699c6 authored by mercury233's avatar mercury233

Revert "rework logic"

This reverts commit efbaa3ef.
parent 1205988b
...@@ -72,15 +72,15 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) { ...@@ -72,15 +72,15 @@ const std::unordered_map<int, int>* DeckManager::GetLFListContent(int lfhash) {
return nullptr; return nullptr;
} }
int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int cardOt) { int DeckManager::IsGameRuleDisallowed(unsigned char hostInfoRule, unsigned int cardOt) {
if(hostInfoRule != 4) { // non-CCG bool allow_ocg = hostInfoRule == 0 || hostInfoRule == 4 || hostInfoRule == 2; // OCG can be used in OCG and OT duels
bool allow_ocg = hostInfoRule == 0 || hostInfoRule == 2; // OCG can be used in OCG and OT duels bool allow_tcg = hostInfoRule == 1 || hostInfoRule == 2; // TCG can be used in TCG and OT duels
bool allow_tcg = hostInfoRule == 1 || hostInfoRule == 2; // TCG can be used in TCG and OT duels bool allow_ccg = hostInfoRule == 0 || hostInfoRule == 4 || hostInfoRule == 2; // CCG can be used in OCG, CCG and OT duels
if(!allow_ocg && ((cardOt & 0x3) == 0x1)) if(!allow_ocg && ((cardOt & 0x3) == 0x1))
return DECKERROR_OCGONLY; return DECKERROR_OCGONLY;
if(!allow_tcg && ((cardOt & 0x3) == 0x2)) if(!allow_tcg && ((cardOt & 0x3) == 0x2))
return DECKERROR_TCGONLY; return DECKERROR_TCGONLY;
} else if((cardOt & 0x8) && (cardOt & 0x3)) { // in CCG duels, cards labeled with ither OCG or TCG, but not CCG, would not be allowed. if(hostInfoRule == 4 && !(cardOt & 0x8) && (cardOt & 0x3)) { // in CCG duels, cards labeled with ither OCG or TCG, but not CCG, would not be allowed.
if((cardOt & 0x3) == 0x2) { if(cardOt & 0x3 == 0x2) {
return DECKERROR_TCGONLY; return DECKERROR_TCGONLY;
} else { } else {
return DECKERROR_OCGONLY; return DECKERROR_OCGONLY;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment