Commit 82fb81ad authored by VanillaSalt's avatar VanillaSalt

fix

parent 261de912
......@@ -115,7 +115,7 @@ field::~field() {
}
void field::reload_field_info() {
pduel->write_buffer8(MSG_RELOAD_FIELD);
pduel->write_buffer8(core.duel_rule - 1);
pduel->write_buffer8(core.duel_rule);
for(int32 playerid = 0; playerid < 2; ++playerid) {
pduel->write_buffer32(player[playerid].lp);
for(auto cit = player[playerid].list_mzone.begin(); cit != player[playerid].list_mzone.end(); ++cit) {
......
......@@ -1114,10 +1114,10 @@ int32 scriptlib::card_is_has_effect(lua_State *L) {
check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1);
uint32 code = lua_tointeger(L, 2);
if(pcard && pcard->is_affected_by_effect(code))
lua_pushboolean(L, 1);
if(pcard)
interpreter::effect2value(L, pcard->is_affected_by_effect(code));
else
lua_pushboolean(L, 0);
lua_pushnil(L);
return 1;
}
int32 scriptlib::card_reset_effect(lua_State *L) {
......
......@@ -1693,6 +1693,8 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
if(core.summon_depth)
return TRUE;
break_effect();
if(ignore_count)
return FALSE;
effect* pextra = (effect*)core.units.begin()->ptr1;
if(!pextra)
core.summon_count[sumplayer]++;
......@@ -1745,6 +1747,8 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
return FALSE;
}
case 10: {
if(ignore_count)
return FALSE;
effect* pextra = (effect*)core.units.begin()->ptr1;
if(!pextra)
core.summon_count[sumplayer]++;
......@@ -2173,6 +2177,8 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
}
case 7: {
break_effect();
if(ignore_count)
return FALSE;
effect* pextra = (effect*)core.units.begin()->ptr1;
if(!pextra)
core.summon_count[setplayer]++;
......
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