Skip to content

Y
ygopro-core
Commit 62600336 authored by DailyShana's avatar DailyShana
Browse files
Options

update get column zone 

format zone in the right way,
remove "left" and "right" parameters
parent 4ba67e7e
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 76 deletions
card.cpp
View file @ 62600336
...@@ -1426,78 +1426,58 @@ int32 card::is_status(uint32 status) { ...@@ -1426,78 +1426,58 @@ 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 card::get_column_zone(int32 location) {
int32 zones = 0; int32 zones = 0;
int32 loc2 = current.location; uint8 seq = current.sequence;
int32 s = current.sequence; if(!(location & LOCATION_ONFIELD) || !(current.location & LOCATION_ONFIELD) || current.location == LOCATION_SZONE && seq >= 5)
if(!(loc1 & LOCATION_ONFIELD) || !(loc2 & LOCATION_ONFIELD) || loc2 == LOCATION_SZONE && s >=5 || left < 0 || right < 0)
return 0; return 0;
if(s <= 4) { if(seq <= 4) {
if(loc1 != loc2) if(location & LOCATION_MZONE) {
zones |= 1u << s; if(!(current.location & LOCATION_MZONE))
zones |= 1u << (16 + (4 - s)); zones |= 1u << seq;
if(loc1 & LOCATION_MZONE) { zones |= 1u << (16 + (4 - seq));
if(s == 1) if(seq == 1)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << 5) | (1u << (16 + 6));
if(s == 3) if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5)); zones |= (1u << 6) | (1u << (16 + 5));
} }
} if(location & LOCATION_SZONE) {
if(s == 5) if(!(current.location & LOCATION_SZONE))
zones |= (1u << 1) | (1u << (16 + 3)); zones |= 1u << (seq + 8);
if(s == 6) zones |= 1u << (16 + 8 + (4 - seq));
zones |= (1u << 3) | (1u << (16 + 1));
for(int32 i = 1; i <= left; ++i) {
int32 seq = s - i;
if(s == 5)
seq = 1 - i;
if(s == 6)
seq = 3 - i;
if(seq >= 0 && seq <= 4) {
zones |= 1u << seq | 1u << (16 + (4 - seq));
if(loc1 & LOCATION_MZONE) {
if(seq == 1)
zones |= (1u << 5) | (1u << (16 + 6));
if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5));
}
} }
} }
for(int32 i = 1; i <= right; ++i) { if(seq == 5) {
int32 seq = s + i; if(location & LOCATION_MZONE)
if(s == 5) zones |= (1u << 1) | (1u << (16 + 3));
seq = 1 + i; if(location & LOCATION_SZONE)
if(s == 6) zones |= (1u << (8 + 1)) | (1u << (16 + 8 + 3));
seq = 3 + i; }
if(seq >= 0 && seq <= 4) { if(seq == 6) {
zones |= 1u << seq | 1u << (16 + (4 - seq)); if(location & LOCATION_MZONE)
if(loc1 & LOCATION_MZONE) { zones |= (1u << 3) | (1u << (16 + 1));
if(seq == 1) if(location & LOCATION_SZONE)
zones |= (1u << 5) | (1u << (16 + 6)); zones |= (1u << (8 + 3)) | (1u << (16 + 8 + 1));
if(seq == 3)
zones |= (1u << 6) | (1u << (16 + 5));
}
}
} }
return zones; return zones;
} }
void card::get_column_cards(card_set* cset, int32 left, int32 right) { void card::get_column_cards(card_set* cset) {
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); uint32 column_mzone = get_column_zone(LOCATION_MZONE);
uint32 column_szone = get_column_zone(LOCATION_SZONE, left, right); uint32 column_szone = get_column_zone(LOCATION_SZONE);
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 >> 8, p, LOCATION_SZONE);
pduel->game_field->get_cards_in_zone(cset, column_szone >> 16, 1 - p, LOCATION_SZONE); pduel->game_field->get_cards_in_zone(cset, column_szone >> 24, 1 - p, LOCATION_SZONE);
} }
int32 card::is_all_column() { 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); get_column_cards(&cset);
int32 full = 3; int32 full = 3;
if(pduel->game_field->core.duel_rule >= 4 && (current.sequence == 1 || current.sequence == 3)) if(pduel->game_field->core.duel_rule >= 4 && (current.sequence == 1 || current.sequence == 3))
full++; full++;
......
card.h
View file @ 62600336
...@@ -233,8 +233,8 @@ public: ...@@ -233,8 +233,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 get_column_zone(int32 location);
void get_column_cards(card_set* cset, int32 left, int32 right); void get_column_cards(card_set* cset);
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 @ 62600336
...@@ -424,14 +424,8 @@ int32 scriptlib::card_get_column_group(lua_State *L) { ...@@ -424,14 +424,8 @@ int32 scriptlib::card_get_column_group(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1); check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1); card* pcard = *(card**) lua_touserdata(L, 1);
int32 left = 0;
int32 right = 0;
if(lua_gettop(L) >= 2)
left = lua_tointeger(L, 2);
if(lua_gettop(L) >= 3)
right = lua_tointeger(L, 3);
card::card_set cset; card::card_set cset;
pcard->get_column_cards(&cset, left, right); pcard->get_column_cards(&cset);
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;
...@@ -440,14 +434,8 @@ int32 scriptlib::card_get_column_group_count(lua_State *L) { ...@@ -440,14 +434,8 @@ int32 scriptlib::card_get_column_group_count(lua_State *L) {
check_param_count(L, 1); check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1); check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1); card* pcard = *(card**) lua_touserdata(L, 1);
int32 left = 0;
int32 right = 0;
if(lua_gettop(L) >= 2)
left = lua_tointeger(L, 2);
if(lua_gettop(L) >= 3)
right = lua_tointeger(L, 3);
card::card_set cset; card::card_set cset;
pcard->get_column_cards(&cset, left, right); pcard->get_column_cards(&cset);
lua_pushinteger(L, cset.size()); lua_pushinteger(L, cset.size());
return 1; return 1;
} }
...@@ -456,16 +444,10 @@ int32 scriptlib::card_get_column_zone(lua_State *L) { ...@@ -456,16 +444,10 @@ int32 scriptlib::card_get_column_zone(lua_State *L) {
check_param(L, PARAM_TYPE_CARD, 1); check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1); card* pcard = *(card**) lua_touserdata(L, 1);
int32 loc = lua_tointeger(L, 2); int32 loc = lua_tointeger(L, 2);
int32 left = 0;
int32 right = 0;
int32 cp = pcard->current.controler; int32 cp = pcard->current.controler;
if(lua_gettop(L) >= 3) if(lua_gettop(L) >= 3 && !lua_isnil(L, 3))
left = lua_tointeger(L, 3); cp = lua_tointeger(L, 3);
if(lua_gettop(L) >= 4) uint32 zone = pcard->get_column_zone(loc);
right = lua_tointeger(L, 4);
if(lua_gettop(L) >= 5 && !lua_isnil(L, 5))
cp = lua_tointeger(L, 5);
uint32 zone = pcard->get_column_zone(loc, left, right);
if(cp == 1 - pcard->current.controler) if(cp == 1 - pcard->current.controler)
lua_pushinteger(L, (((zone & 0xffff) << 16) | (zone >> 16))); lua_pushinteger(L, (((zone & 0xffff) << 16) | (zone >> 16)));
else else
......
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