Merge branch 'master' of https://github.com/Fluorohydride/ygopro-core

field.cpp

@@ -982,7 +982,7 @@ void field::filter_player_effect(uint8 playerid, uint32 code, effect_set* eset,
 	if(sort)
 		eset->sort();
 }
-int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, uint32 location2, group* pgroup, card* pexception, uint32 extraargs, card** pret, int32 fcount, int32 is_target) {
+int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, uint32 location2, group* pgroup, card* pexception, group* pexgroup, uint32 extraargs, card** pret, int32 fcount, int32 is_target) {
 	if(self != 0 && self != 1)
 		return FALSE;
 	card* pcard;
@@ -993,7 +993,8 @@ int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, ui
 			for(uint32 i = 0; i < 5; ++i) {
 				pcard = player[self].list_mzone[i];
 				if(pcard && !pcard->get_status(STATUS_SUMMONING | STATUS_SUMMON_DISABLED | STATUS_SPSUMMON_STEP)
-						&& pcard != pexception && pduel->lua->check_matching(pcard, findex, extraargs) 
+						&& pcard != pexception && !(pexgroup && pexgroup->has_card(pcard))
+						&& pduel->lua->check_matching(pcard, findex, extraargs)
 						&& (!is_target || pcard->is_capable_be_effect_target(core.reason_effect, core.reason_player))) {
 					if(pret) {
 						*pret = pcard;
@@ -1011,7 +1012,9 @@ int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, ui
 		if(location & LOCATION_SZONE) {
 			for(uint32 i = 0; i < 8; ++i) {
 				pcard = player[self].list_szone[i];
-				if(pcard && !pcard->is_status(STATUS_ACTIVATE_DISABLED) && pcard != pexception && pduel->lua->check_matching(pcard, findex, extraargs)
+				if(pcard && !pcard->is_status(STATUS_ACTIVATE_DISABLED)
+				        && pcard != pexception && !(pexgroup && pexgroup->has_card(pcard))
+				        && pduel->lua->check_matching(pcard, findex, extraargs)
 				        && (!is_target || pcard->is_capable_be_effect_target(core.reason_effect, core.reason_player))) {
 					if(pret) {
 						*pret = pcard;
@@ -1028,7 +1031,8 @@ int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, ui
 		}
 		if(location & LOCATION_DECK) {
 			for(auto cit = player[self].list_main.rbegin(); cit != player[self].list_main.rend(); ++cit) {
-				if(*cit != pexception && pduel->lua->check_matching(*cit, findex, extraargs)
+				if(*cit != pexception && !(pexgroup && pexgroup->has_card(*cit))
+				        && pduel->lua->check_matching(*cit, findex, extraargs)
 				        && (!is_target || (*cit)->is_capable_be_effect_target(core.reason_effect, core.reason_player))) {
 					if(pret) {
 						*pret = *cit;
@@ -1045,7 +1049,8 @@ int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, ui
 		}
 		if(location & LOCATION_EXTRA) {
 			for(auto cit = player[self].list_extra.rbegin(); cit != player[self].list_extra.rend(); ++cit) {
-				if(*cit != pexception && pduel->lua->check_matching(*cit, findex, extraargs)
+				if(*cit != pexception && !(pexgroup && pexgroup->has_card(*cit))
+				        && pduel->lua->check_matching(*cit, findex, extraargs)
 				        && (!is_target || (*cit)->is_capable_be_effect_target(core.reason_effect, core.reason_player))) {
 					if(pret) {
 						*pret = *cit;
@@ -1062,7 +1067,8 @@ int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, ui
 		}
 		if(location & LOCATION_HAND) {
 			for(auto cit = player[self].list_hand.begin(); cit != player[self].list_hand.end(); ++cit) {
-				if(*cit != pexception && pduel->lua->check_matching(*cit, findex, extraargs)
+				if(*cit != pexception && !(pexgroup && pexgroup->has_card(*cit))
+				        && pduel->lua->check_matching(*cit, findex, extraargs)
 				        && (!is_target || (*cit)->is_capable_be_effect_target(core.reason_effect, core.reason_player))) {
 					if(pret) {
 						*pret = *cit;
@@ -1079,7 +1085,8 @@ int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, ui
 		}
 		if(location & LOCATION_GRAVE) {
 			for(auto cit = player[self].list_grave.rbegin(); cit != player[self].list_grave.rend(); ++cit) {
-				if(*cit != pexception && pduel->lua->check_matching(*cit, findex, extraargs)
+				if(*cit != pexception && !(pexgroup && pexgroup->has_card(*cit))
+				        && pduel->lua->check_matching(*cit, findex, extraargs)
 				        && (!is_target || (*cit)->is_capable_be_effect_target(core.reason_effect, core.reason_player))) {
 					if(pret) {
 						*pret = *cit;
@@ -1096,7 +1103,8 @@ int32 field::filter_matching_card(int32 findex, uint8 self, uint32 location1, ui
 		}
 		if(location & LOCATION_REMOVED) {
 			for(auto cit = player[self].list_remove.rbegin(); cit != player[self].list_remove.rend(); ++cit) {
-				if(*cit != pexception && pduel->lua->check_matching(*cit, findex, extraargs)
+				if(*cit != pexception && !(pexgroup && pexgroup->has_card(*cit))
+				        && pduel->lua->check_matching(*cit, findex, extraargs)
 				        && (!is_target || (*cit)->is_capable_be_effect_target(core.reason_effect, core.reason_player))) {
 					if(pret) {
 						*pret = *cit;
@@ -1183,12 +1191,12 @@ effect* field::is_player_affected_by_effect(uint8 playerid, uint32 code) {
 	}
 	return 0;
 }
-int32 field::get_release_list(uint8 playerid, card_set* release_list, card_set* ex_list, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exp) {
+int32 field::get_release_list(uint8 playerid, card_set* release_list, card_set* ex_list, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exc, group* exg) {
 	card* pcard;
 	uint32 rcount = 0;
 	for(uint32 i = 0; i < 5; ++i) {
 		pcard = player[playerid].list_mzone[i];
-		if(pcard && pcard != exp && pcard->is_releasable_by_nonsummon(playerid)
+		if(pcard && pcard != exc && !(exg && exg->has_card(pcard)) && pcard->is_releasable_by_nonsummon(playerid)
 		        && (!use_con || pduel->lua->check_matching(pcard, fun, exarg))) {
 			if(release_list)
 				release_list->insert(pcard);
@@ -1199,7 +1207,7 @@ int32 field::get_release_list(uint8 playerid, card_set* release_list, card_set*
 	if(use_hand) {
 		for(uint32 i = 0; i < player[playerid].list_hand.size(); ++i) {
 			pcard = player[playerid].list_hand[i];
-			if(pcard && pcard != exp && pcard->is_releasable_by_nonsummon(playerid)
+			if(pcard && pcard != exc && !(exg && exg->has_card(pcard)) && pcard->is_releasable_by_nonsummon(playerid)
 			        && (!use_con || pduel->lua->check_matching(pcard, fun, exarg))) {
 				if(release_list)
 					release_list->insert(pcard);
@@ -1210,7 +1218,7 @@ int32 field::get_release_list(uint8 playerid, card_set* release_list, card_set*
 	}
 	for(uint32 i = 0; i < 5; ++i) {
 		pcard = player[1 - playerid].list_mzone[i];
-		if(pcard && pcard != exp && (pcard->is_position(POS_FACEUP) || !use_con) && pcard->is_affected_by_effect(EFFECT_EXTRA_RELEASE)
+		if(pcard && pcard != exc && !(exg && exg->has_card(pcard)) && (pcard->is_position(POS_FACEUP) || !use_con) && pcard->is_affected_by_effect(EFFECT_EXTRA_RELEASE)
 		        && pcard->is_releasable_by_nonsummon(playerid) && (!use_con || pduel->lua->check_matching(pcard, fun, exarg))) {
 			if(ex_list)
 				ex_list->insert(pcard);
@@ -1220,11 +1228,11 @@ int32 field::get_release_list(uint8 playerid, card_set* release_list, card_set*
 	}
 	return rcount;
 }
-int32 field::check_release_list(uint8 playerid, int32 count, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exp) {
+int32 field::check_release_list(uint8 playerid, int32 count, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exc, group* exg) {
 	card* pcard;
 	for(uint32 i = 0; i < 5; ++i) {
 		pcard = player[playerid].list_mzone[i];
-		if(pcard && pcard != exp && pcard->is_releasable_by_nonsummon(playerid)
+		if(pcard && pcard != exc && !(exg && exg->has_card(pcard)) && pcard->is_releasable_by_nonsummon(playerid)
 		        && (!use_con || pduel->lua->check_matching(pcard, fun, exarg))) {
 			count--;
 			if(count == 0)
@@ -1234,7 +1242,7 @@ int32 field::check_release_list(uint8 playerid, int32 count, int32 use_con, int3
 	if(use_hand) {
 		for(uint32 i = 0; i < player[playerid].list_hand.size(); ++i) {
 			pcard = player[playerid].list_hand[i];
-			if(pcard && pcard != exp && pcard->is_releasable_by_nonsummon(playerid)
+			if(pcard && pcard != exc && !(exg && exg->has_card(pcard)) && pcard->is_releasable_by_nonsummon(playerid)
 			        && (!use_con || pduel->lua->check_matching(pcard, fun, exarg))) {
 				count--;
 				if(count == 0)
@@ -1244,7 +1252,7 @@ int32 field::check_release_list(uint8 playerid, int32 count, int32 use_con, int3
 	}
 	for(uint32 i = 0; i < 5; ++i) {
 		pcard = player[1 - playerid].list_mzone[i];
-		if(pcard && pcard != exp && (!use_con || pcard->is_position(POS_FACEUP)) && pcard->is_affected_by_effect(EFFECT_EXTRA_RELEASE)
+		if(pcard && pcard != exc && !(exg && exg->has_card(pcard)) && (!use_con || pcard->is_position(POS_FACEUP)) && pcard->is_affected_by_effect(EFFECT_EXTRA_RELEASE)
 		        && pcard->is_releasable_by_nonsummon(playerid) && (!use_con || pduel->lua->check_matching(pcard, fun, exarg))) {
 			count--;
 			if(count == 0)

field.h

@@ -294,6 +294,8 @@ struct processor {
 	uint8 attack_state_count[2];
 	uint8 battle_phase_count[2];
 	uint8 battled_count[2];
+	uint8 tossed_coin_count[2];
+	uint8 tossed_dice_count[2];
 	uint8 phase_action;
 	uint32 hint_timing[2];
 	uint8 current_player;
@@ -359,12 +361,12 @@ public:
 	void filter_field_effect(uint32 code, effect_set* eset, uint8 sort = TRUE);
 	void filter_affected_cards(effect* peffect, card_set* cset);
 	void filter_player_effect(uint8 playerid, uint32 code, effect_set* eset, uint8 sort = TRUE);
-	int32 filter_matching_card(int32 findex, uint8 self, uint32 location1, uint32 location2, group* pgroup, card* pexception, uint32 extraargs, card** pret = 0, int32 fcount = 0, int32 is_target = FALSE);
+	int32 filter_matching_card(int32 findex, uint8 self, uint32 location1, uint32 location2, group* pgroup, card* pexception, group* pexgroup, uint32 extraargs, card** pret = 0, int32 fcount = 0, int32 is_target = FALSE);
 	int32 filter_field_card(uint8 self, uint32 location, uint32 location2, group* pgroup);
 	effect* is_player_affected_by_effect(uint8 playerid, uint32 code);
 
-	int32 get_release_list(uint8 playerid, card_set* release_list, card_set* ex_list, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exp);
-	int32 check_release_list(uint8 playerid, int32 count, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exp);
+	int32 get_release_list(uint8 playerid, card_set* release_list, card_set* ex_list, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exc, group* exg);
+	int32 check_release_list(uint8 playerid, int32 count, int32 use_con, int32 use_hand, int32 fun, int32 exarg, card* exc, group* exg);
 	int32 get_summon_release_list(card* target, card_set* release_list, card_set* ex_list, card_set* ex_list_sum, group* mg = NULL, uint32 ex = 0);
 	int32 get_summon_count_limit(uint8 playerid);
 	int32 get_draw_count(uint8 playerid);

interpreter.cpp

@@ -506,6 +506,8 @@ static const struct luaL_Reg duellib[] = {
 	{ "AddCustomActivityCounter", scriptlib::duel_add_custom_activity_counter },
 	{ "GetCustomActivityCount", scriptlib::duel_get_custom_activity_count },
 	{ "GetBattledCount", scriptlib::duel_get_battled_count },
+	{ "GetTossedCoinCount", scriptlib::duel_get_tossed_coin_count },
+	{ "GetTossedDiceCount", scriptlib::duel_get_tossed_dice_count },
 	{ "IsAbleToEnterBP", scriptlib::duel_is_able_to_enter_bp },
 	{ "VenomSwampCheck", scriptlib::duel_venom_swamp_check },
 	{ "SwapDeckAndGrave", scriptlib::duel_swap_deck_and_grave },

libgroup.cpp

@@ -29,12 +29,10 @@ int32 scriptlib::group_clone(lua_State *L) {
 int32 scriptlib::group_from_cards(lua_State *L) {
 	duel* pduel = interpreter::get_duel_info(L);
 	group* pgroup = pduel->new_group();
-	card* pcard;
-	void* p;
 	for(int32 i = 0; i < lua_gettop(L); ++i) {
-		p = lua_touserdata(L, i + 1);
+		void* p = lua_touserdata(L, i + 1);
 		if(p) {
-			pcard = *(card**)p;
+			card* pcard = *(card**)p;
 			pgroup->container.insert(pcard);
 		}
 	}
@@ -144,17 +142,21 @@ int32 scriptlib::group_filter(lua_State *L) {
 	check_param_count(L, 3);
 	check_param(L, PARAM_TYPE_GROUP, 1);
 	check_param(L, PARAM_TYPE_FUNCTION, 2);
-	card* pexception = 0;
-	if(!lua_isnil(L, 3)) {
-		check_param(L, PARAM_TYPE_CARD, 3);
-		pexception = *(card**) lua_touserdata(L, 3);
-	}
 	group* pgroup = *(group**) lua_touserdata(L, 1);
+	field::card_set cset(pgroup->container);
+	if(check_param(L, PARAM_TYPE_CARD, 3, TRUE)) {
+		card* pexception = *(card**) lua_touserdata(L, 3);
+		cset.erase(pexception);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 3, TRUE)) {
+		group* pexgroup = *(group**) lua_touserdata(L, 3);
+		for(auto cit = pexgroup->container.begin(); cit != pexgroup->container.end(); ++cit)
+			cset.erase(*cit);
+	}
 	duel* pduel = pgroup->pduel;
 	group* new_group = pduel->new_group();
 	uint32 extraargs = lua_gettop(L) - 3;
-	for (auto it = pgroup->container.begin(); it != pgroup->container.end(); ++it) {
-		if((*it) != pexception && pduel->lua->check_matching(*it, 2, extraargs)) {
+	for(auto it = cset.begin(); it != cset.end(); ++it) {
+		if(pduel->lua->check_matching(*it, 2, extraargs)) {
 			new_group->container.insert(*it);
 		}
 	}
@@ -165,17 +167,21 @@ int32 scriptlib::group_filter_count(lua_State *L) {
 	check_param_count(L, 3);
 	check_param(L, PARAM_TYPE_GROUP, 1);
 	check_param(L, PARAM_TYPE_FUNCTION, 2);
-	card* pexception = 0;
-	if(!lua_isnil(L, 3)) {
-		check_param(L, PARAM_TYPE_CARD, 3);
-		pexception = *(card**) lua_touserdata(L, 3);
-	}
 	group* pgroup = *(group**) lua_touserdata(L, 1);
+	field::card_set cset(pgroup->container);
+	if(check_param(L, PARAM_TYPE_CARD, 3, TRUE)) {
+		card* pexception = *(card**) lua_touserdata(L, 3);
+		cset.erase(pexception);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 3, TRUE)) {
+		group* pexgroup = *(group**) lua_touserdata(L, 3);
+		for(auto cit = pexgroup->container.begin(); cit != pexgroup->container.end(); ++cit)
+			cset.erase(*cit);
+	}
 	duel* pduel = pgroup->pduel;
 	uint32 extraargs = lua_gettop(L) - 3;
 	uint32 count = 0;
-	for (auto it = pgroup->container.begin(); it != pgroup->container.end(); ++it) {
-		if((*it) != pexception && pduel->lua->check_matching(*it, 2, extraargs))
+	for (auto it = cset.begin(); it != cset.end(); ++it) {
+		if(pduel->lua->check_matching(*it, 2, extraargs))
 			count++;
 	}
 	lua_pushinteger(L, count);
@@ -186,12 +192,16 @@ int32 scriptlib::group_filter_select(lua_State *L) {
 	check_param_count(L, 6);
 	check_param(L, PARAM_TYPE_GROUP, 1);
 	check_param(L, PARAM_TYPE_FUNCTION, 3);
-	card* pexception = 0;
-	if(!lua_isnil(L, 6)) {
-		check_param(L, PARAM_TYPE_CARD, 6);
-		pexception = *(card**) lua_touserdata(L, 6);
-	}
 	group* pgroup = *(group**) lua_touserdata(L, 1);
+	field::card_set cset(pgroup->container);
+	if(check_param(L, PARAM_TYPE_CARD, 6, TRUE)) {
+		card* pexception = *(card**) lua_touserdata(L, 6);
+		cset.erase(pexception);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 6, TRUE)) {
+		group* pexgroup = *(group**) lua_touserdata(L, 6);
+		for(auto cit = pexgroup->container.begin(); cit != pexgroup->container.end(); ++cit)
+			cset.erase(*cit);
+	}
 	duel* pduel = pgroup->pduel;
 	uint32 playerid = lua_tointeger(L, 2);
 	if(playerid != 0 && playerid != 1)
@@ -200,8 +210,8 @@ int32 scriptlib::group_filter_select(lua_State *L) {
 	uint32 max = lua_tointeger(L, 5);
 	uint32 extraargs = lua_gettop(L) - 6;
 	pduel->game_field->core.select_cards.clear();
-	for (auto it = pgroup->container.begin(); it != pgroup->container.end(); ++it) {
-		if((*it) != pexception && pduel->lua->check_matching(*it, 3, extraargs))
+	for (auto it = cset.begin(); it != cset.end(); ++it) {
+		if(pduel->lua->check_matching(*it, 3, extraargs))
 			pduel->game_field->core.select_cards.push_back(*it);
 	}
 	pduel->game_field->add_process(PROCESSOR_SELECT_CARD_S, 0, 0, 0, playerid, min + (max << 16));
@@ -211,12 +221,16 @@ int32 scriptlib::group_select(lua_State *L) {
 	check_action_permission(L);
 	check_param_count(L, 5);
 	check_param(L, PARAM_TYPE_GROUP, 1);
-	card* pexception = 0;
-	if(!lua_isnil(L, 5)) {
-		check_param(L, PARAM_TYPE_CARD, 5);
-		pexception = *(card**) lua_touserdata(L, 5);
-	}
 	group* pgroup = *(group**) lua_touserdata(L, 1);
+	field::card_set cset(pgroup->container);
+	if(check_param(L, PARAM_TYPE_CARD, 5, TRUE)) {
+		card* pexception = *(card**) lua_touserdata(L, 5);
+		cset.erase(pexception);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 5, TRUE)) {
+		group* pexgroup = *(group**) lua_touserdata(L, 5);
+		for(auto cit = pexgroup->container.begin(); cit != pexgroup->container.end(); ++cit)
+			cset.erase(*cit);
+	}
 	duel* pduel = pgroup->pduel;
 	uint32 playerid = lua_tointeger(L, 2);
 	if(playerid != 0 && playerid != 1)
@@ -224,8 +238,7 @@ int32 scriptlib::group_select(lua_State *L) {
 	uint32 min = lua_tointeger(L, 3);
 	uint32 max = lua_tointeger(L, 4);
 	pduel->game_field->core.select_cards.clear();
-	for (auto it = pgroup->container.begin(); it != pgroup->container.end(); ++it) {
-		if((*it) != pexception)
+	for (auto it = cset.begin(); it != cset.end(); ++it) {
 		pduel->game_field->core.select_cards.push_back(*it);
 	}
 	pduel->game_field->add_process(PROCESSOR_SELECT_CARD_S, 0, 0, 0, playerid, min + (max << 16));
@@ -244,19 +257,23 @@ int32 scriptlib::group_is_exists(lua_State *L) {
 	check_param_count(L, 4);
 	check_param(L, PARAM_TYPE_GROUP, 1);
 	check_param(L, PARAM_TYPE_FUNCTION, 2);
-	card* pcard = 0;
-	if(!lua_isnil(L, 4)) {
-		check_param(L, PARAM_TYPE_CARD, 4);
-		pcard = *(card**) lua_touserdata(L, 4);
-	}
 	group* pgroup = *(group**) lua_touserdata(L, 1);
+	field::card_set cset(pgroup->container);
+	if(check_param(L, PARAM_TYPE_CARD, 4, TRUE)) {
+		card* pexception = *(card**) lua_touserdata(L, 4);
+		cset.erase(pexception);
+	} else if(check_param(L, PARAM_TYPE_GROUP, 4, TRUE)) {
+		group* pexgroup = *(group**) lua_touserdata(L, 4);
+		for(auto cit = pexgroup->container.begin(); cit != pexgroup->container.end(); ++cit)
+			cset.erase(*cit);
+	}
 	duel* pduel = pgroup->pduel;
 	uint32 count = lua_tointeger(L, 3);
 	uint32 extraargs = lua_gettop(L) - 4;
 	uint32 fcount = 0;
 	uint32 result = FALSE;
-	for (auto it = pgroup->container.begin(); it != pgroup->container.end(); ++it) {
-		if((*it) != pcard && pduel->lua->check_matching(*it, 2, extraargs)) {
+	for (auto it = cset.begin(); it != cset.end(); ++it) {
+		if(pduel->lua->check_matching(*it, 2, extraargs)) {
 			fcount++;
 			if(fcount >= count) {
 				result = TRUE;

operations.cpp

@@ -5051,6 +5051,7 @@ int32 field::toss_coin(uint16 step, effect * reason_effect, uint8 reason_player,
 			pduel->write_buffer8(count);
 			for(int32 i = 0; i < count; ++i) {
 				core.coin_result[i] = pduel->get_next_integer(0, 1);
+				core.tossed_coin_count[playerid]++;
 				pduel->write_buffer8(core.coin_result[i]);
 			}
 			raise_event((card*)0, EVENT_TOSS_COIN_NEGATE, reason_effect, 0, reason_player, playerid, count);
@@ -5096,6 +5097,7 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
 			pduel->write_buffer8(count1);
 			for(int32 i = 0; i < count1; ++i) {
 				core.dice_result[i] = pduel->get_next_integer(1, 6);
+				core.tossed_dice_count[playerid]++;
 				pduel->write_buffer8(core.dice_result[i]);
 			}
 			if(count2 > 0) {
@@ -5104,6 +5106,7 @@ int32 field::toss_dice(uint16 step, effect * reason_effect, uint8 reason_player,
 				pduel->write_buffer8(count2);
 				for(int32 i = 0; i < count2; ++i) {
 					core.dice_result[count1 + i] = pduel->get_next_integer(1, 6);
+						core.tossed_dice_count[1 - playerid]++;
 					pduel->write_buffer8(core.dice_result[count1 + i]);
 				}
 			}

processor.cpp

@@ -3936,6 +3936,8 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 			core.attack_state_count[p] = 0;
 			core.battle_phase_count[p] = 0;
 			core.battled_count[p] = 0;
+			core.tossed_coin_count[p] = 0;
+			core.tossed_dice_count[p] = 0;
 			core.summon_count[p] = 0;
 			core.extra_summon[p] = 0;
 			core.spsummon_once_map[p].clear();

scriptlib.h

@@ -507,6 +507,8 @@ public:
 	static int32 duel_get_custom_activity_count(lua_State *L);
 	static int32 duel_is_able_to_enter_bp(lua_State *L);
 	static int32 duel_get_battled_count(lua_State *L);
+	static int32 duel_get_tossed_coin_count(lua_State *L);
+	static int32 duel_get_tossed_dice_count(lua_State *L);
 
 	//specific card functions
 	static int32 duel_venom_swamp_check(lua_State *L);