Skip to content

Y
ygopro-core
Commit df798aed authored by mercury233's avatar mercury233
Browse files
Options

update & fix

parent b1190ba0
Hide whitespace changes
Inline Side-by-side
Showing with 21 additions and 24 deletions
card.cpp
View file @ df798aed
...@@ -1309,8 +1309,8 @@ void card::get_mutual_linked_cards(card_set* cset) { ...@@ -1309,8 +1309,8 @@ void card::get_mutual_linked_cards(card_set* cset) {
return; return;
int32 p = current.controler; int32 p = current.controler;
uint32 mutual_linked_zone = get_mutual_linked_zone(); uint32 mutual_linked_zone = get_mutual_linked_zone();
pduel->game_field->get_cards_in_zone(cset, mutual_linked_zone, p); pduel->game_field->get_cards_in_zone(cset, mutual_linked_zone, p, LOCATION_MZONE);
pduel->game_field->get_cards_in_zone(cset, mutual_linked_zone >> 16, 1 - p); pduel->game_field->get_cards_in_zone(cset, mutual_linked_zone >> 16, 1 - p, LOCATION_MZONE);
} }
int32 card::is_link_state() { int32 card::is_link_state() {
if(current.location != LOCATION_MZONE) if(current.location != LOCATION_MZONE)
...@@ -1344,7 +1344,7 @@ int32 card::is_status(uint32 status) { ...@@ -1344,7 +1344,7 @@ int32 card::is_status(uint32 status) {
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck) { uint32 card::get_column_zone(int32 loc1, int32 left, int32 right) {
int32 zones = 0; int32 zones = 0;
int32 loc2 = current.location; int32 loc2 = current.location;
int32 s = current.sequence; int32 s = current.sequence;
...@@ -1354,9 +1354,9 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck ...@@ -1354,9 +1354,9 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck
if(loc1 != loc2) if(loc1 != loc2)
zones |= 1u << s; zones |= 1u << s;
zones |= 1u << (16 + (4 - s)); zones |= 1u << (16 + (4 - s));
if(s == 1 && excheck) if(s == 1)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << 5) | (1u << (16 + 6));
if(s == 3 && excheck) if(s == 3)
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
if(s == 5) if(s == 5)
...@@ -1368,9 +1368,9 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck ...@@ -1368,9 +1368,9 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck
if(seq >= 0) { if(seq >= 0) {
if(seq <= 4) { if(seq <= 4) {
zones |= 1u << seq | 1u << (16 + (4 - seq)); zones |= 1u << seq | 1u << (16 + (4 - seq));
if(seq == 1 && excheck) if(seq == 1)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << 5) | (1u << (16 + 6));
if(seq == 3 && excheck) if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
if(seq == 5) if(seq == 5)
...@@ -1384,9 +1384,9 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck ...@@ -1384,9 +1384,9 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck
if(seq <= 6) { if(seq <= 6) {
if(seq <= 4) { if(seq <= 4) {
zones |= 1u << seq | 1u << (16 + (4 - seq)); zones |= 1u << seq | 1u << (16 + (4 - seq));
if(seq == 1 && excheck) if(seq == 1)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << 5) | (1u << (16 + 6));
if(seq == 3 && excheck) if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
if(seq == 5) if(seq == 5)
...@@ -1397,13 +1397,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck ...@@ -1397,13 +1397,13 @@ uint32 card::get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck
} }
return zones; return zones;
} }
void card::get_column_cards(card_set* cset, int32 left, int32 right, uint32 excheck) { void card::get_column_cards(card_set* cset, int32 left, int32 right) {
cset->clear(); cset->clear();
if(!(current.location & LOCATION_ONFIELD)) if(!(current.location & LOCATION_ONFIELD))
return; return;
int32 p = current.controler; int32 p = current.controler;
uint32 column_mzone = get_column_zone(LOCATION_MZONE, left, right, excheck); uint32 column_mzone = get_column_zone(LOCATION_MZONE, left, right);
uint32 column_szone = get_column_zone(LOCATION_SZONE, left, right, false); uint32 column_szone = get_column_zone(LOCATION_SZONE, left, right);
pduel->game_field->get_cards_in_zone(cset, column_mzone, p, LOCATION_MZONE); pduel->game_field->get_cards_in_zone(cset, column_mzone, p, LOCATION_MZONE);
pduel->game_field->get_cards_in_zone(cset, column_mzone >> 16, 1 - p, LOCATION_MZONE); pduel->game_field->get_cards_in_zone(cset, column_mzone >> 16, 1 - p, LOCATION_MZONE);
pduel->game_field->get_cards_in_zone(cset, column_szone, p, LOCATION_SZONE); pduel->game_field->get_cards_in_zone(cset, column_szone, p, LOCATION_SZONE);
...@@ -1413,8 +1413,11 @@ int32 card::is_all_column() { ...@@ -1413,8 +1413,11 @@ int32 card::is_all_column() {
if(!(current.location & LOCATION_ONFIELD)) if(!(current.location & LOCATION_ONFIELD))
return FALSE; return FALSE;
card_set cset; card_set cset;
get_column_cards(&cset, 0, 0, true); get_column_cards(&cset, 0, 0);
if((cset.size() == 3 && pduel->game_field->core.duel_rule < 4) || (cset.size() == 4 && pduel->game_field->core.duel_rule >= 4)) int32 full = 3;
if(pduel->game_field->core.duel_rule >= 4 && (current.sequence == 1 || current.sequence == 3))
full++;
if(cset.size() == full)
return TRUE; return TRUE;
return FALSE; return FALSE;
} }
......
card.h
View file @ df798aed
...@@ -208,8 +208,8 @@ public: ...@@ -208,8 +208,8 @@ public:
void set_status(uint32 status, int32 enabled); void set_status(uint32 status, int32 enabled);
int32 get_status(uint32 status); int32 get_status(uint32 status);
int32 is_status(uint32 status); int32 is_status(uint32 status);
uint32 get_column_zone(int32 loc1, int32 left, int32 right, uint32 excheck); uint32 get_column_zone(int32 loc1, int32 left, int32 right);
void get_column_cards(card_set* cset, int32 left, int32 right, uint32 excheck); void get_column_cards(card_set* cset, int32 left, int32 right);
int32 is_all_column(); int32 is_all_column();
void equip(card *target, uint32 send_msg = TRUE); void equip(card *target, uint32 send_msg = TRUE);
......
libcard.cpp
View file @ df798aed
...@@ -350,15 +350,12 @@ int32 scriptlib::card_get_column_group(lua_State *L) { ...@@ -350,15 +350,12 @@ int32 scriptlib::card_get_column_group(lua_State *L) {
card* pcard = *(card**) lua_touserdata(L, 1); card* pcard = *(card**) lua_touserdata(L, 1);
int32 left = 0; int32 left = 0;
int32 right = 0; int32 right = 0;
uint32 excheck = TRUE;
if(lua_gettop(L) >= 2) if(lua_gettop(L) >= 2)
left = lua_tointeger(L, 2); left = lua_tointeger(L, 2);
if(lua_gettop(L) >= 3) if(lua_gettop(L) >= 3)
right = lua_tointeger(L, 3); right = lua_tointeger(L, 3);
if(lua_gettop(L) >= 4)
excheck = lua_toboolean(L, 4);
card::card_set cset; card::card_set cset;
pcard->get_column_cards(&cset, left, right, excheck); pcard->get_column_cards(&cset, left, right);
group* pgroup = pcard->pduel->new_group(cset); group* pgroup = pcard->pduel->new_group(cset);
interpreter::group2value(L, pgroup); interpreter::group2value(L, pgroup);
return 1; return 1;
...@@ -369,15 +366,12 @@ int32 scriptlib::card_get_column_group_count(lua_State *L) { ...@@ -369,15 +366,12 @@ int32 scriptlib::card_get_column_group_count(lua_State *L) {
card* pcard = *(card**) lua_touserdata(L, 1); card* pcard = *(card**) lua_touserdata(L, 1);
int32 left = 0; int32 left = 0;
int32 right = 0; int32 right = 0;
uint32 excheck = TRUE;
if(lua_gettop(L) >= 2) if(lua_gettop(L) >= 2)
left = lua_tointeger(L, 2); left = lua_tointeger(L, 2);
if(lua_gettop(L) >= 3) if(lua_gettop(L) >= 3)
right = lua_tointeger(L, 3); right = lua_tointeger(L, 3);
if(lua_gettop(L) >= 4)
excheck = lua_toboolean(L, 4);
card::card_set cset; card::card_set cset;
pcard->get_column_cards(&cset, left, right, excheck); pcard->get_column_cards(&cset, left, right);
lua_pushinteger(L, cset.size()); lua_pushinteger(L, cset.size());
return 1; return 1;
} }
......
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