add Card.GetXyzType&Card.IsXyzType (#99)

card.cpp

@@ -440,6 +440,11 @@ uint32 card::get_synchro_type() {
 		return data.type;
 	return get_type();
 }
+uint32 card::get_xyz_type() {
+	if(current.location == LOCATION_SZONE && (data.type & TYPE_MONSTER))
+		return data.type;
+	return get_type();
+}
 uint32 card::get_link_type() {
 	if(current.location == LOCATION_SZONE && (data.type & TYPE_MONSTER))
 		return data.type;
@@ -3415,7 +3420,7 @@ int32 card::is_can_be_ritual_material(card* scard) {
 int32 card::is_can_be_xyz_material(card* scard) {
 	if(data.type & TYPE_TOKEN)
 		return FALSE;
-	if(!(get_type() & TYPE_MONSTER))
+	if(!(get_xyz_type() & TYPE_MONSTER))
 		return FALSE;
 	if(is_status(STATUS_FORBIDDEN))
 		return FALSE;

card.h

@@ -179,6 +179,7 @@ public:
 	uint32 get_type();
 	uint32 get_fusion_type();
 	uint32 get_synchro_type();
+	uint32 get_xyz_type();
 	uint32 get_link_type();
 	int32 get_base_attack();
 	int32 get_attack();

interpreter.cpp

@@ -29,6 +29,7 @@ static const struct luaL_Reg cardlib[] = {
 	{ "GetOriginalType", scriptlib::card_get_origin_type },
 	{ "GetFusionType", scriptlib::card_get_fusion_type },
 	{ "GetSynchroType", scriptlib::card_get_synchro_type },
+	{ "GetXyzType", scriptlib::card_get_xyz_type },
 	{ "GetLinkType", scriptlib::card_get_link_type },
 	{ "GetLevel", scriptlib::card_get_level },
 	{ "GetRank", scriptlib::card_get_rank },
@@ -92,6 +93,7 @@ static const struct luaL_Reg cardlib[] = {
 	{ "IsType", scriptlib::card_is_type },
 	{ "IsFusionType", scriptlib::card_is_fusion_type },
 	{ "IsSynchroType", scriptlib::card_is_synchro_type },
+	{ "IsXyzType", scriptlib::card_is_xyz_type },
 	{ "IsLinkType", scriptlib::card_is_link_type },
 	{ "IsRace", scriptlib::card_is_race },
 	{ "IsAttribute", scriptlib::card_is_attribute },

libcard.cpp

@@ -168,6 +168,13 @@ int32 scriptlib::card_get_synchro_type(lua_State *L) {
 	lua_pushinteger(L, pcard->get_synchro_type());
 	return 1;
 }
+int32 scriptlib::card_get_xyz_type(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->get_xyz_type());
+	return 1;
+}
 int32 scriptlib::card_get_link_type(lua_State *L) {
 	check_param_count(L, 1);
 	check_param(L, PARAM_TYPE_CARD, 1);
@@ -675,6 +682,17 @@ int32 scriptlib::card_is_synchro_type(lua_State *L) {
 		lua_pushboolean(L, 0);
 	return 1;
 }
+int32 scriptlib::card_is_xyz_type(lua_State *L) {
+	check_param_count(L, 2);
+	check_param(L, PARAM_TYPE_CARD, 1);
+	card* pcard = *(card**) lua_touserdata(L, 1);
+	uint32 ttype = lua_tointeger(L, 2);
+	if(pcard->get_xyz_type() & ttype)
+		lua_pushboolean(L, 1);
+	else
+		lua_pushboolean(L, 0);
+	return 1;
+}
 int32 scriptlib::card_is_link_type(lua_State *L) {
 	check_param_count(L, 2);
 	check_param(L, PARAM_TYPE_CARD, 1);

scriptlib.h

@@ -31,6 +31,7 @@ public:
 	static int32 card_get_origin_type(lua_State *L);
 	static int32 card_get_fusion_type(lua_State *L);
 	static int32 card_get_synchro_type(lua_State *L);
+	static int32 card_get_xyz_type(lua_State *L);
 	static int32 card_get_link_type(lua_State *L);
 	static int32 card_get_level(lua_State *L);
 	static int32 card_get_rank(lua_State *L);
@@ -94,6 +95,7 @@ public:
 	static int32 card_is_type(lua_State *L);
 	static int32 card_is_fusion_type(lua_State *L);
 	static int32 card_is_synchro_type(lua_State *L);
+	static int32 card_is_xyz_type(lua_State *L);
 	static int32 card_is_link_type(lua_State *L);
 	static int32 card_is_race(lua_State *L);
 	static int32 card_is_attribute(lua_State *L);