Commit 22e84bb6 authored by nanahira's avatar nanahira

Add Card.GetRemovedOverlayCount

parent 05b1fc1a
......@@ -2065,6 +2065,7 @@ void card::reset(uint32 id, uint32 reset_type) {
attacked_cards.clear();
announce_count = 0;
attacked_count = 0;
removed_overlay_count = 0;
attack_all_target = TRUE;
}
if(id & 0xdfe0000) {
......
......@@ -108,6 +108,7 @@ public:
};
//millux
uint32 get_ritual_type();
uint32 set_entity_code(uint32 entity_code, bool remove_alias = false);
uint32 get_summon_info();
......@@ -151,6 +152,7 @@ public:
uint8 direct_attackable;
uint8 announce_count;
uint8 attacked_count;
uint8 removed_overlay_count;
uint8 attack_all_target;
uint8 attack_controler;
uint16 cardid;
......
......@@ -22,7 +22,8 @@ static const struct luaL_Reg cardlib[] = {
{ "SetCardData", scriptlib::card_set_card_data },
{ "GetLinkMarker", scriptlib::card_get_link_marker },
{ "GetOriginalLinkMarker", scriptlib::card_get_origin_link_marker },
{ "IsXyzSummonableByRose", scriptlib::card_is_xyz_summonable_by_rose },
{ "IsXyzSummonableByRose", scriptlib::card_is_xyz_summonable_by_rose },
{ "GetRemovedOverlayCount", scriptlib::card_get_removed_overlay_count },
{ "GetCode", scriptlib::card_get_code },
{ "GetOriginalCode", scriptlib::card_get_origin_code },
......
......@@ -128,6 +128,13 @@ int32 scriptlib::card_is_xyz_summonable_by_rose(lua_State *L) {
lua_pushboolean(L, result);
return 1;
}
int32 scriptlib::card_get_removed_overlay_count(lua_State *L) {
check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1);
lua_pushinteger(L, pcard->removed_overlay_count);
return 1;
}
int32 scriptlib::card_get_code(lua_State *L) {
check_param_count(L, 1);
......
......@@ -837,6 +837,11 @@ int32 field::remove_overlay_card(uint16 step, uint32 reason, card* pcard, uint8
card_set cset;
for(int32 i = 0; i < returns.bvalue[0]; ++i)
cset.insert(core.select_cards[returns.bvalue[i + 1]]);
for(auto cit = cset.begin(); cit != cset.end(); ++cit) {
card* xcard = *cit;
if(xcard->overlay_target)
xcard->overlay_target->removed_overlay_count++;
}
send_to(&cset, core.reason_effect, reason, rplayer, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP);
return FALSE;
}
......
......@@ -3979,6 +3979,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
pcard->indestructable_effects.clear();
pcard->announce_count = 0;
pcard->attacked_count = 0;
pcard->removed_overlay_count = 0;
pcard->announced_cards.clear();
pcard->attacked_cards.clear();
pcard->battled_cards.clear();
......@@ -4191,6 +4192,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
continue;
pcard->announce_count = 0;
pcard->attacked_count = 0;
pcard->removed_overlay_count = 0;
pcard->announced_cards.clear();
pcard->attacked_cards.clear();
pcard->battled_cards.clear();
......
......@@ -21,8 +21,9 @@ public:
static int32 card_set_entity_code(lua_State *L);
static int32 card_set_card_data(lua_State *L);
static int32 card_get_link_marker(lua_State *L);
static int32 card_get_origin_link_marker(lua_State *L);
static int32 card_is_xyz_summonable_by_rose(lua_State *L);
static int32 card_get_origin_link_marker(lua_State *L);
static int32 card_is_xyz_summonable_by_rose(lua_State *L);
static int32 card_get_removed_overlay_count(lua_State *L);
static int32 effect_set_owner(lua_State *L);
static int32 effect_get_range(lua_State *L);
static int32 effect_get_count_limit(lua_State *L);
......
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