Commit 2167fc3a authored by salix5's avatar salix5

code

always treated as x: datas.alias=x in cdb
also always treated as x: datas.alias=x in cdb + EFFECT_ADD_CODE in script
parent e67564a5
......@@ -232,7 +232,7 @@ uint32 card::get_code() {
code = effects.get_last()->get_value(this);
temp.code = 0xffffffff;
if (code == data.code) {
if(data.alias)
if(data.alias && !is_affected_by_effect(EFFECT_ADD_CODE))
code = data.alias;
} else {
card_data dat;
......
......@@ -47,12 +47,12 @@ int32 scriptlib::card_get_origin_code_rule(lua_State *L) {
check_param_count(L, 1);
check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1);
if(pcard->data.alias)
effect_set eset;
pcard->filter_effect(EFFECT_ADD_CODE, &eset);
if(pcard->data.alias && !eset.size())
lua_pushinteger(L, pcard->data.alias);
else {
lua_pushinteger(L, pcard->data.code);
effect_set eset;
pcard->filter_effect(EFFECT_ADD_CODE, &eset);
if(eset.size()) {
uint32 otcode = eset.get_last()->get_value(pcard);
lua_pushinteger(L, otcode);
......
......@@ -3033,12 +3033,12 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
pcard->previous.defence = pcard->get_defence();
}
} else {
if(pcard->data.alias)
effect_set eset;
pcard->filter_effect(EFFECT_ADD_CODE, &eset);
if(pcard->data.alias && !eset.size())
pcard->previous.code = pcard->data.alias;
else
pcard->previous.code = pcard->data.code;
effect_set eset;
pcard->filter_effect(EFFECT_ADD_CODE, &eset);
if(eset.size())
pcard->previous.code2 = eset.get_last()->get_value(pcard);
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