Skip to content

Y
ygopro
Commit e6139ec7 authored by salix5's avatar salix5
Browse files
Options

atk/def

parent 3935b2d5
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
ocgcore/card.cpp
View file @ e6139ec7
...@@ -369,7 +369,7 @@ uint32 card::get_type() { ...@@ -369,7 +369,7 @@ uint32 card::get_type() {
int32 card::get_base_attack(uint8 swap) { int32 card::get_base_attack(uint8 swap) {
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.attack; return data.attack;
if (temp.base_attack != -1) if (temp.base_attack != -1)
return temp.base_attack; return temp.base_attack;
...@@ -397,7 +397,7 @@ int32 card::get_attack() { ...@@ -397,7 +397,7 @@ int32 card::get_attack() {
return assume_value; return assume_value;
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.attack; return data.attack;
if (temp.attack != -1) if (temp.attack != -1)
return temp.attack; return temp.attack;
...@@ -408,7 +408,7 @@ int32 card::get_attack() { ...@@ -408,7 +408,7 @@ int32 card::get_attack() {
int32 card::get_base_defence(uint8 swap) { int32 card::get_base_defence(uint8 swap) {
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.defence; return data.defence;
if (temp.base_defence != -1) if (temp.base_defence != -1)
return temp.base_defence; return temp.base_defence;
...@@ -436,7 +436,7 @@ int32 card::get_defence() { ...@@ -436,7 +436,7 @@ int32 card::get_defence() {
return assume_value; return assume_value;
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.defence; return data.defence;
if (temp.defence != -1) if (temp.defence != -1)
return temp.defence; return temp.defence;
......
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