Skip to content

Y
ygopro-core
Commit dc19f5ff authored by Chen Bill's avatar Chen Bill Committed by GitHub
Browse files
Options

update level, rank, link functions (#717)

parent 9fc0625d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
card.cpp
View file @ dc19f5ff
...@@ -974,13 +974,13 @@ uint32_t card::get_level() { ...@@ -974,13 +974,13 @@ uint32_t card::get_level() {
temp.level = level + up; temp.level = level + up;
} }
level += up; level += up;
if(level < 1 && (get_type() & TYPE_MONSTER)) if (level < 1)
level = 1; level = 1;
temp.level = UINT32_MAX; temp.level = UINT32_MAX;
return level; return level;
} }
uint32_t card::get_rank() { uint32_t card::get_rank() {
if(!(data.type & TYPE_XYZ) || (status & STATUS_NO_LEVEL)) if (!(data.type & TYPE_XYZ))
return 0; return 0;
if(assume_type == ASSUME_RANK) if(assume_type == ASSUME_RANK)
return assume_value; return assume_value;
...@@ -1007,13 +1007,13 @@ uint32_t card::get_rank() { ...@@ -1007,13 +1007,13 @@ uint32_t card::get_rank() {
temp.level = rank + up; temp.level = rank + up;
} }
rank += up; rank += up;
if(rank < 1 && (get_type() & TYPE_MONSTER)) if (rank < 1)
rank = 1; rank = 1;
temp.level = UINT32_MAX; temp.level = UINT32_MAX;
return rank; return rank;
} }
uint32_t card::get_link() { uint32_t card::get_link() {
if(!(data.type & TYPE_LINK) || (status & STATUS_NO_LEVEL)) if (!(data.type & TYPE_LINK))
return 0; return 0;
return data.level; return data.level;
} }
......
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