Commit 49ba5e3c authored by salix5's avatar salix5

Card.IsOriginalCodeRule()

a and b have the same name: a:IsCode(b:GetCode())
a and b have the same original name: a:IsOriginalCodeRule(b:GetOriginalCodeRule())
GetOriginalCode()
printed name on cards(can be different from original card name)
GetOriginalCodeRule()
original card name
parent 3cbdbf5a
...@@ -242,7 +242,19 @@ uint32 card::get_info_location() { ...@@ -242,7 +242,19 @@ uint32 card::get_info_location() {
return c + (l << 8) + (s << 16) + (ss << 24); return c + (l << 8) + (s << 16) + (ss << 24);
} }
} }
// get the current code // mapping of double-name cards
uint32 card::second_code(uint32 code){
switch(code){
case CARD_MARINE_DOLPHIN:
return 17955766u;
case CARD_TWINKLE_MOSS:
return 17732278u;
default:
return 0;
}
}
// return: the current card name
// for double-name card, it returns printed name
uint32 card::get_code() { uint32 card::get_code() {
if(assume_type == ASSUME_CODE) if(assume_type == ASSUME_CODE)
return assume_value; return assume_value;
...@@ -261,21 +273,24 @@ uint32 card::get_code() { ...@@ -261,21 +273,24 @@ uint32 card::get_code() {
} else { } else {
card_data dat; card_data dat;
read_card(code, &dat); read_card(code, &dat);
if (dat.alias) if (dat.alias && !second_code(code))
code = dat.alias; code = dat.alias;
} }
return code; return code;
} }
// get the current second-code // return: the current second card name
// for double-name cards, it returns the name in description
uint32 card::get_another_code() { uint32 card::get_another_code() {
if(is_affected_by_effect(EFFECT_CHANGE_CODE)) uint32 code = get_code();
return 0; if(code != data.code){
return second_code(code);
}
effect_set eset; effect_set eset;
filter_effect(EFFECT_ADD_CODE, &eset); filter_effect(EFFECT_ADD_CODE, &eset);
if(!eset.size()) if(!eset.size())
return 0; return 0;
uint32 otcode = eset.get_last()->get_value(this); uint32 otcode = eset.get_last()->get_value(this);
if(get_code() != otcode) if(code != otcode)
return otcode; return otcode;
return 0; return 0;
} }
......
...@@ -192,6 +192,7 @@ public: ...@@ -192,6 +192,7 @@ public:
uint32 get_infos(byte* buf, int32 query_flag, int32 use_cache = TRUE); uint32 get_infos(byte* buf, int32 query_flag, int32 use_cache = TRUE);
uint32 get_info_location(); uint32 get_info_location();
uint32 second_code(uint32 code);
uint32 get_code(); uint32 get_code();
uint32 get_another_code(); uint32 get_another_code();
int32 is_set_card(uint32 set_code); int32 is_set_card(uint32 set_code);
...@@ -373,4 +374,8 @@ public: ...@@ -373,4 +374,8 @@ public:
#define ASSUME_ATTACK 7 #define ASSUME_ATTACK 7
#define ASSUME_DEFENSE 8 #define ASSUME_DEFENSE 8
//double-name cards
#define CARD_MARINE_DOLPHIN 78734254
#define CARD_TWINKLE_MOSS 13857930
#endif /* CARD_H_ */ #endif /* CARD_H_ */
...@@ -100,6 +100,7 @@ static const struct luaL_Reg cardlib[] = { ...@@ -100,6 +100,7 @@ static const struct luaL_Reg cardlib[] = {
{ "GetTurnID", scriptlib::card_get_turnid }, { "GetTurnID", scriptlib::card_get_turnid },
{ "GetFieldID", scriptlib::card_get_fieldid }, { "GetFieldID", scriptlib::card_get_fieldid },
{ "GetRealFieldID", scriptlib::card_get_fieldidr }, { "GetRealFieldID", scriptlib::card_get_fieldidr },
{ "IsOriginalCodeRule", scriptlib::card_is_origin_code_rule },
{ "IsCode", scriptlib::card_is_code }, { "IsCode", scriptlib::card_is_code },
{ "IsType", scriptlib::card_is_type }, { "IsType", scriptlib::card_is_type },
{ "IsFusionType", scriptlib::card_is_fusion_type }, { "IsFusionType", scriptlib::card_is_fusion_type },
......
...@@ -795,6 +795,37 @@ int32 scriptlib::card_get_fieldidr(lua_State *L) { ...@@ -795,6 +795,37 @@ int32 scriptlib::card_get_fieldidr(lua_State *L) {
lua_pushinteger(L, pcard->fieldid_r); lua_pushinteger(L, pcard->fieldid_r);
return 1; return 1;
} }
int32 scriptlib::card_is_origin_code_rule(lua_State *L) {
check_param_count(L, 2);
check_param(L, PARAM_TYPE_CARD, 1);
card* pcard = *(card**) lua_touserdata(L, 1);
uint32 code1 = 0;
uint32 code2 = 0;
effect_set eset;
pcard->filter_effect(EFFECT_ADD_CODE, &eset);
if(pcard->data.alias && !eset.size()){
code1 = pcard->data.alias;
code2 = 0;
}
else {
code1 = pcard->data.code;
if(eset.size())
code2 = eset.get_last()->get_value(pcard);
}
uint32 count = lua_gettop(L) - 1;
uint32 result = FALSE;
for(uint32 i = 0; i < count; ++i) {
if(lua_isnil(L, i + 2))
continue;
uint32 tcode = lua_tointeger(L, i + 2);
if(code1 == tcode || (code2 && code2 == tcode)) {
result = TRUE;
break;
}
}
lua_pushboolean(L, result);
return 1;
}
int32 scriptlib::card_is_code(lua_State *L) { int32 scriptlib::card_is_code(lua_State *L) {
check_param_count(L, 2); check_param_count(L, 2);
check_param(L, PARAM_TYPE_CARD, 1); check_param(L, PARAM_TYPE_CARD, 1);
......
...@@ -825,8 +825,6 @@ int32 field::announce_attribute(int16 step, uint8 playerid, int32 count, int32 a ...@@ -825,8 +825,6 @@ int32 field::announce_attribute(int16 step, uint8 playerid, int32 count, int32 a
} }
return TRUE; return TRUE;
} }
#define CARD_MARINE_DOLPHIN 78734254
#define CARD_TWINKLE_MOSS 13857930
static int32 is_declarable(card_data const& cd, const std::vector<uint32>& opcode) { static int32 is_declarable(card_data const& cd, const std::vector<uint32>& opcode) {
std::stack<int32> stack; std::stack<int32> stack;
for(auto& it : opcode) { for(auto& it : opcode) {
......
...@@ -692,7 +692,7 @@ int32 field::process() { ...@@ -692,7 +692,7 @@ int32 field::process() {
pduel->lua->add_param((void*)0, PARAM_TYPE_GROUP); pduel->lua->add_param((void*)0, PARAM_TYPE_GROUP);
else { else {
card* pcard; card* pcard;
if(returns.bvalue[1] < core.select_cards.size()) if((uint8)returns.bvalue[1] < core.select_cards.size())
pcard = core.select_cards[returns.bvalue[1]]; pcard = core.select_cards[returns.bvalue[1]];
else else
pcard = core.unselect_cards[returns.bvalue[1] - core.select_cards.size()]; pcard = core.unselect_cards[returns.bvalue[1] - core.select_cards.size()];
......
...@@ -104,6 +104,7 @@ public: ...@@ -104,6 +104,7 @@ public:
static int32 card_get_turnid(lua_State *L); static int32 card_get_turnid(lua_State *L);
static int32 card_get_fieldid(lua_State *L); static int32 card_get_fieldid(lua_State *L);
static int32 card_get_fieldidr(lua_State *L); static int32 card_get_fieldidr(lua_State *L);
static int32 card_is_origin_code_rule(lua_State *L);
static int32 card_is_code(lua_State *L); static int32 card_is_code(lua_State *L);
static int32 card_is_type(lua_State *L); static int32 card_is_type(lua_State *L);
static int32 card_is_fusion_type(lua_State *L); static int32 card_is_fusion_type(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