Merge remote-tracking branch 'upstream/patch-flag' into develop

card.cpp

@@ -1276,15 +1276,15 @@ uint32 card::get_rscale() {
 	temp.rscale = UINT32_MAX;
 	return rscale;
 }
-uint32 card::get_link_marker() const {
+uint32 card::get_link_marker() {
 	if(!(data.type & TYPE_LINK))
 		return 0;
 	return data.link_marker;
 }
-uint32 card::is_link_marker(uint32 dir) const {
+uint32 card::is_link_marker(uint32 dir) {
 	return get_link_marker() & dir;
 }
-uint32 card::get_linked_zone() const {
+uint32 card::get_linked_zone() {
 	if(!(data.type & TYPE_LINK) || current.location != LOCATION_MZONE || is_treated_as_not_on_field())
 		return 0;
 	uint32 zones = 0;
@@ -1340,7 +1340,7 @@ void card::get_linked_cards(card_set* cset) {
 	pduel->game_field->get_cards_in_zone(cset, linked_zone, p, LOCATION_MZONE);
 	pduel->game_field->get_cards_in_zone(cset, linked_zone >> 16, 1 - p, LOCATION_MZONE);
 }
-uint32 card::get_mutual_linked_zone() const {
+uint32 card::get_mutual_linked_zone() {
 	if(!(data.type & TYPE_LINK) || current.location != LOCATION_MZONE || is_treated_as_not_on_field())
 		return 0;
 	uint32 zones = 0;

card.h

@@ -262,11 +262,11 @@ public:
 	uint32 get_grave_race(uint8 playerid);
 	uint32 get_lscale();
 	uint32 get_rscale();
-	uint32 get_link_marker() const;
-	uint32 is_link_marker(uint32 dir) const;
-	uint32 get_linked_zone() const;
+	uint32 get_link_marker();
+	uint32 is_link_marker(uint32 dir);
+	uint32 get_linked_zone();
 	void get_linked_cards(card_set* cset);
-	uint32 get_mutual_linked_zone() const;
+	uint32 get_mutual_linked_zone();
 	void get_mutual_linked_cards(card_set * cset);
 	int32 is_link_state();
 	int32 is_extra_link_state();

effect.h

@@ -22,6 +22,7 @@ struct effect_set;
 struct effect_set_v;
 enum effect_flag : uint64;
 enum effect_flag2 : uint64;
+enum effect_category :uint64;
 enum code_type : int32;
 
 bool is_continuous_event(uint32 code);
@@ -214,6 +215,9 @@ enum effect_flag : uint64 {
 	EFFECT_FLAG_ACTIVATE_CONDITION	= 0x20000000,
 //	EFFECT_FLAG_CVAL_CHECK			= 0x40000000,
 	EFFECT_FLAG_IMMEDIATELY_APPLY	= 0x80000000,
+	EFFECT_FLAG_COIN				= 0x100000000,
+	EFFECT_FLAG_DICE				= 0x200000000,
+	EFFECT_FLAG_FUSION_SUMMON		= 0x400000000,
 };
 enum effect_flag2 : uint64 {
 	EFFECT_FLAG2_REPEAT_UPDATE			= 0x0001,
@@ -225,6 +229,49 @@ constexpr effect_flag operator|(effect_flag flag1, effect_flag flag2) {
 	return static_cast<effect_flag>(static_cast<uint32>(flag1) | static_cast<uint32>(flag2));
 }
 constexpr uint32 INTERNAL_FLAGS = EFFECT_FLAG_INITIAL | EFFECT_FLAG_COPY | EFFECT_FLAG_FUNC_VALUE | EFFECT_FLAG_COUNT_LIMIT | EFFECT_FLAG_FIELD_ONLY | EFFECT_FLAG_ABSOLUTE_TARGET;
+
+//Category
+enum effect_category :uint64 {
+	CATEGORY_DESTROY		= 0x1,
+	CATEGORY_RELEASE		= 0x2,
+	CATEGORY_REMOVE			= 0x4,
+	CATEGORY_TOHAND			= 0x8,
+	CATEGORY_TODECK			= 0x10,
+	CATEGORY_TOGRAVE		= 0x20,
+	CATEGORY_DECKDES		= 0x40,
+	CATEGORY_HANDES			= 0x80,
+	CATEGORY_SUMMON			= 0x100,
+	CATEGORY_SPECIAL_SUMMON	= 0x200,
+	CATEGORY_TOKEN			= 0x400,
+	CATEGORY_GRAVE_ACTION	= 0x800,
+	CATEGORY_POSITION		= 0x1000,
+	CATEGORY_CONTROL		= 0x2000,
+	CATEGORY_DISABLE		= 0x4000,
+	CATEGORY_DISABLE_SUMMON = 0x8000,
+	CATEGORY_DRAW			= 0x10000,
+	CATEGORY_SEARCH			= 0x20000,
+	CATEGORY_EQUIP			= 0x40000,
+	CATEGORY_DAMAGE			= 0x80000,
+	CATEGORY_RECOVER		= 0x100000,
+	CATEGORY_ATKCHANGE		= 0x200000,
+	CATEGORY_DEFCHANGE		= 0x400000,
+	CATEGORY_COUNTER		= 0x800000,
+	CATEGORY_COIN			= 0x1000000,
+	CATEGORY_DICE			= 0x2000000,
+	CATEGORY_LEAVE_GRAVE	= 0x4000000,
+	CATEGORY_GRAVE_SPSUMMON = 0x8000000,
+	CATEGORY_NEGATE			= 0x10000000,
+	CATEGORY_ANNOUNCE		= 0x20000000,
+	CATEGORY_FUSION_SUMMON	= 0x40000000,
+	CATEGORY_TOEXTRA		= 0x80000000,
+};
+
+const std::map<uint64, uint64> category_checklist{
+	{CATEGORY_COIN, EFFECT_FLAG_COIN},
+	{CATEGORY_DICE, EFFECT_FLAG_DICE},
+	{CATEGORY_FUSION_SUMMON, EFFECT_FLAG_FUSION_SUMMON},
+};
+
 //========== Codes ==========
 #define EFFECT_IMMUNE_EFFECT			1	//
 #define EFFECT_DISABLE					2	//

libcard.cpp

@@ -1828,6 +1828,10 @@ int32 scriptlib::card_register_effect(lua_State *L) {
 		pduel->game_field->core.reseted_effects.insert(peffect);
 		return 0;
 	}
+	for (auto& entry : category_checklist) {
+		if (peffect->category & entry.first)
+			peffect->flag[0] |= entry.second;
+	}
 	int32 id;
 	if (peffect->handler)
 		id = -1;