add TYPES_EXTRA_DECK (#617)

card.cpp

@@ -3244,12 +3244,12 @@ int32 card::check_cost_condition(int32 ecode, int32 playerid, int32 sumtype) {
 	pduel->game_field->core.reason_player = op;
 	return res;
 }
-int32 card::is_summonable_card() {
+int32 card::is_summonable_card() const {
 	if(!(data.type & TYPE_MONSTER))
 		return FALSE;
-	return !(data.type & (TYPE_RITUAL | TYPE_SPSUMMON
-		| TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK
-		| TYPE_TOKEN | TYPE_TRAPMONSTER));
+	if (data.type & TYPES_EXTRA_DECK)
+		return FALSE;
+	return !(data.type & (TYPE_RITUAL | TYPE_SPSUMMON | TYPE_TOKEN));
 }
 int32 card::is_spsummonable_card() {
 	if(!(data.type & TYPE_MONSTER))

card.h

@@ -212,7 +212,7 @@ public:
 	explicit card(duel* pd);
 	~card() = default;
 	static bool card_operation_sort(card* c1, card* c2);
-	const bool is_extra_deck_monster() { return !!(data.type & (TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)); }
+	bool is_extra_deck_monster() const { return !!(data.type & TYPES_EXTRA_DECK); }
 
 	int32 get_infos(byte* buf, uint32 query_flag, int32 use_cache = TRUE);
 	uint32 get_info_location();
@@ -341,7 +341,7 @@ public:
 	void get_unique_target(card_set* cset, int32 controler, card* icard = nullptr);
 	int32 check_cost_condition(int32 ecode, int32 playerid);
 	int32 check_cost_condition(int32 ecode, int32 playerid, int32 sumtype);
-	int32 is_summonable_card();
+	int32 is_summonable_card() const;
 	int32 is_spsummonable_card();
 	int32 is_fusion_summonable_card(uint32 summon_type);
 	int32 is_spsummonable(effect* proc, material_info info = null_info);

common.h

@@ -110,6 +110,8 @@ typedef signed char int8;
 #define TYPE_SPSUMMON		0x2000000	//
 #define TYPE_LINK			0x4000000	//
 
+#define TYPES_EXTRA_DECK	(TYPE_FUSION | TYPE_SYNCHRO | TYPE_XYZ | TYPE_LINK)
+
 //Attributes
 #define ATTRIBUTE_ALL		0x7f		//
 #define ATTRIBUTE_EARTH		0x01		//