Merge branch 'patch-allow-synchro' into develop

card.cpp

@@ -1066,47 +1066,29 @@ uint32_t card::get_link() {
 		return 0;
 	return data.level;
 }
-uint32_t card::get_synchro_level(card* pcard) {
-	if((data.type & (TYPE_XYZ | TYPE_LINK)) || (status & STATUS_NO_LEVEL))
-	{
-		uint32_t lev;
-		effect_set eset;
-		filter_effect(EFFECT_ALLOW_SYNCHRO_KOISHI, &eset);
-		if(eset.size())
-			lev = eset[0]->get_value(pcard);
-		else
-			lev = 0;
-		return lev;
-	}
-		//return 0;
-	uint32_t lev;
+
+uint32_t get_mat_level_from_effect(card* pcard, uint32_t effect_code) {
+	if(!effect_code)
+		return 0;
 	effect_set eset;
-	filter_effect(EFFECT_SYNCHRO_LEVEL, &eset);
-	if(eset.size())
-		lev = eset[0]->get_value(pcard);
-	else
-		lev = get_level();
-	return lev;
-}
-uint32_t card::get_ritual_level(card* pcard) {
-	effect_set eset_g;
-	filter_effect(EFFECT_MINIATURE_GARDEN_GIRL, &eset_g);
-	for(int32_t i = 0; i < eset_g.size(); ++i) {
-		pduel->lua->add_param(eset_g[i], PARAM_TYPE_EFFECT);
-		pduel->lua->add_param(pcard, PARAM_TYPE_CARD);
-		if(pduel->lua->check_condition(eset_g[i]->target, 2))
-			return pcard->get_level();
+	pduel->game_field->filter_effect(effect_code, &eset);
+	for(int32_t i = 0; i < eset.size(); ++i) {
+		uint32_t lev = eset[i]->get_value(pcard);
+		if(lev)
+			return lev;
 	}
+	return 0;
+}
+uint32_t card::get_mat_level(card* pcard, uint32_t level_effect_code, uint32_t allow_effect_code) {
 	if((data.type & (TYPE_XYZ | TYPE_LINK)) || (status & STATUS_NO_LEVEL))
-		return 0;
-	uint32_t lev;
-	effect_set eset;
-	filter_effect(EFFECT_RITUAL_LEVEL, &eset);
-	if(eset.size())
-		lev = eset[0]->get_value(pcard);
-	else
-		lev = get_level();
-	return lev;
+		return get_mat_level_from_effect(pcard, allow_effect_code);
+	return get_mat_level_from_effect(pcard, level_effect_code) || get_level();
+}
+uint32_t card::get_synchro_level(card* pcard) {
+	return get_mat_level(pcard, EFFECT_SYNCHRO_LEVEL, EFFECT_ALLOW_FOR_SYNCHRO);
+}
+uint32_t card::get_ritual_level(card* pcard) {
+	return get_mat_level(pcard, EFFECT_RITUAL_LEVEL, EFFECT_ALLOW_FOR_RITUAL);
 }
 uint32_t card::check_xyz_level(card* pcard, uint32_t lv) {
 	if(status & STATUS_NO_LEVEL)
@@ -4216,8 +4198,7 @@ int32_t card::is_can_be_fusion_material(card* fcard, uint32_t summon_type) {
 	return TRUE;
 }
 int32_t card::is_can_be_synchro_material(card* scard, card* tuner) {
-	//support urara
-	if(data.type & (TYPE_XYZ | TYPE_LINK) && !is_affected_by_effect(EFFECT_ALLOW_SYNCHRO_KOISHI))
+	if((data.type & (TYPE_XYZ | TYPE_LINK)) && !get_synchro_level(scard))
 		return FALSE;
 	if(!(get_synchro_type() & TYPE_MONSTER))
 		return FALSE;

card.h

@@ -253,6 +253,8 @@ public:
 	uint32_t get_level();
 	uint32_t get_rank();
 	uint32_t get_link();
+	uint32_t get_mat_level_from_effect(card* pcard, uint32_t effect_code);
+	uint32_t get_mat_level(card* pcard, uint32_t level_effect_code, uint32_t allow_effect_code = 0);
 	uint32_t get_synchro_level(card* pcard);
 	uint32_t get_ritual_level(card* pcard);
 	uint32_t check_xyz_level(card* pcard, uint32_t lv);

effect.h

@@ -133,14 +133,11 @@ public:
 #define EFFECT_CANNOT_LOSE_KOISHI			37564153
 #define EFFECT_EXTRA_TOMAIN_KOISHI			37564154
 #define EFFECT_OVERLAY_REMOVE_COST_CHANGE_KOISHI			37564155
-#define EFFECT_ALLOW_SYNCHRO_KOISHI			37564156
-#define EFFECT_MINIATURE_GARDEN_GIRL		37564157
 #define EFFECT_ADD_SUMMON_TYPE_KOISHI		37564158
 #define EFFECT_REMOVE_SUMMON_TYPE_KOISHI	37564159
 #define EFFECT_CHANGE_SUMMON_TYPE_KOISHI	37564160
 #define EFFECT_CHANGE_SUMMON_LOCATION_KOISHI				37564161
 #define EFFECT_LINK_SPELL_KOISHI			37564162
-#define EFFECT_SEA_PULSE					37564163
 #define EFFECT_MAP_OF_HEAVEN				77702007
 
 //status
@@ -550,6 +547,8 @@ const std::map<uint64_t, uint64_t> category_checklist{
 #define EFFECT_KAISER_COLOSSEUM			370
 #define EFFECT_REPLACE_DAMAGE			371
 #define EFFECT_XYZ_MIN_COUNT			372
+#define EFFECT_ALLOW_FOR_SYNCHRO		373
+#define EFFECT_ALLOW_FOR_RITUAL		374
 
 //#define EVENT_STARTUP		1000
 #define EVENT_FLIP			1001

field.cpp

@@ -1868,11 +1868,11 @@ void field::get_ritual_material(uint8_t playerid, effect* peffect, card_set* mat
 	for(auto& pcard : player[playerid].list_mzone) {
 		if(pcard && pcard->is_affect_by_effect(peffect)
 		        && pcard->is_releasable_by_nonsummon(playerid, REASON_EFFECT) && pcard->is_releasable_by_effect(playerid, peffect)
-				&& (no_level || pcard->get_level() > 0 || pcard->is_affected_by_effect(EFFECT_MINIATURE_GARDEN_GIRL)))
+				&& (no_level || pcard->get_level() > 0 || pcard->is_affected_by_effect(EFFECT_ALLOW_FOR_RITUAL)))
 			material->insert(pcard);
 		if(pcard && pcard->is_affected_by_effect(EFFECT_OVERLAY_RITUAL_MATERIAL))
 			for(auto& mcard : pcard->xyz_materials)
-				if (no_level || mcard->get_level() > 0)
+				if (no_level || mcard->get_level() > 0 || pcard->is_affected_by_effect(EFFECT_ALLOW_FOR_RITUAL))
 					material->insert(mcard);
 	}
 	for(auto& pcard : player[1 - playerid].list_mzone) {
@@ -1888,11 +1888,11 @@ void field::get_ritual_material(uint8_t playerid, effect* peffect, card_set* mat
 	for(auto& pcard : player[playerid].list_grave)
 		if((pcard->data.type & TYPE_MONSTER)
 				&& pcard->is_affected_by_effect(EFFECT_EXTRA_RITUAL_MATERIAL) && pcard->is_removeable(playerid, POS_FACEUP, REASON_EFFECT)
-				&& (no_level || pcard->get_level() > 0))
+				&& (no_level || pcard->get_level() > 0 || pcard->is_affected_by_effect(EFFECT_ALLOW_FOR_RITUAL)))
 			material->insert(pcard);
 	for(auto& pcard : player[playerid].list_extra)
 		if(((pcard->is_affected_by_effect(EFFECT_EXTRA_RITUAL_MATERIAL) || pcard->data.type & TYPE_MONSTER) && pcard->is_affected_by_effect(EFFECT_MAP_OF_HEAVEN) && pcard->is_capable_send_to_grave(playerid))
-				&& (no_level || pcard->get_level() > 0))
+				&& (no_level || pcard->get_level() > 0 || pcard->is_affected_by_effect(EFFECT_ALLOW_FOR_RITUAL)))
 			material->insert(pcard);
 }
 void field::get_fusion_material(uint8_t playerid, card_set* material_all, card_set* material_base, uint32_t location) {

interpreter.cpp

@@ -99,10 +99,10 @@ interpreter::interpreter(duel* pd): coroutines(256) {
 	lua_setglobal(lua_state, "EFFECT_EXTRA_TOMAIN_KOISHI");
 	lua_pushinteger(lua_state, EFFECT_OVERLAY_REMOVE_COST_CHANGE_KOISHI);
 	lua_setglobal(lua_state, "EFFECT_OVERLAY_REMOVE_COST_CHANGE_KOISHI");
-	lua_pushinteger(lua_state, EFFECT_ALLOW_SYNCHRO_KOISHI);
-	lua_setglobal(lua_state, "EFFECT_ALLOW_SYNCHRO_KOISHI");
-	lua_pushinteger(lua_state, EFFECT_MINIATURE_GARDEN_GIRL);
-	lua_setglobal(lua_state, "EFFECT_MINIATURE_GARDEN_GIRL");
+	lua_pushinteger(lua_state, EFFECT_ALLOW_FOR_SYNCHRO);
+	lua_setglobal(lua_state, "EFFECT_ALLOW_SYNCHRO_KOISHI"); // for compat only
+	// lua_pushinteger(lua_state, EFFECT_MINIATURE_GARDEN_GIRL);
+	// lua_setglobal(lua_state, "EFFECT_MINIATURE_GARDEN_GIRL");
 	lua_pushinteger(lua_state, EFFECT_ADD_SUMMON_TYPE_KOISHI);
 	lua_setglobal(lua_state, "EFFECT_ADD_SUMMON_TYPE_KOISHI");
 	lua_pushinteger(lua_state, EFFECT_REMOVE_SUMMON_TYPE_KOISHI);