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

field.h

@@ -192,8 +192,6 @@ struct processor {
 	event_list sub_solving_event;
 	chain_array select_chains;
 	chain_array current_chain;
-	chain_list tpchain;
-	chain_list ntpchain;
 	chain_list continuous_chain;
 	chain_list desrep_chain;
 	chain_list new_fchain;
@@ -500,7 +498,6 @@ public:
 	int32 process_turn(uint16 step, uint8 turn_player);
 
 	int32 add_chain(uint16 step);
-	int32 sort_chain(uint16 step, uint8 tp);
 	int32 solve_continuous(uint16 step, effect* peffect, uint8 triggering_player);
 	int32 solve_chain(uint16 step, uint32 chainend_arg1, uint32 chainend_arg2);
 	int32 break_effect();
@@ -689,7 +686,7 @@ public:
 #define PROCESSOR_SELECT_PLACE		18
 #define PROCESSOR_SELECT_POSITION	19
 #define PROCESSOR_SELECT_TRIBUTE_P	20
-#define PROCESSOR_SORT_CHAIN		21
+//#define PROCESSOR_SORT_CHAIN		21
 #define PROCESSOR_SELECT_COUNTER	22
 #define PROCESSOR_SELECT_SUM		23
 #define PROCESSOR_SELECT_DISFIELD	24

operations.cpp

@@ -1541,8 +1541,6 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
 		}
 		effect* peffect = core.select_effects[returns.ivalue[0]];
 		core.units.begin()->peffect = peffect;
-		int32 unlimited = -1;
-		bool force_select = false;
 		core.select_effects.clear();
 		core.select_options.clear();
 		if(ignore_count || core.summon_count[sumplayer] < get_summon_count_limit(sumplayer)) {
@@ -1557,12 +1555,9 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
 				int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f;
 				int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff;
 				new_zone &= zone;
-				bool unchanged = (new_zone == zone);
 				if(peffect) {
-					if(new_min_tribute < (int32)min_tribute) {
+					if(new_min_tribute < (int32)min_tribute)
 						new_min_tribute = min_tribute;
-						unchanged = false;
-					}
 					if(!target->is_summonable(peffect, new_min_tribute, new_zone, releasable))
 						continue;
 				} else {
@@ -1575,25 +1570,17 @@ int32 field::summon(uint16 step, uint8 sumplayer, card* target, effect* proc, ui
 						min = min_tribute;
 					if(max < min)
 						continue;
-					if(min < new_min_tribute) {
+					if(min < new_min_tribute)
 						min = new_min_tribute;
-						unchanged = false;
-					}
 					if(!check_tribute(target, min, max, 0, target->current.controler, new_zone, releasable))
 						continue;
 				}
-				if(unlimited < 0 && unchanged)
-					unlimited = (int32)core.select_effects.size();
-				if(eset[i]->operation)
-					force_select = true;
 				core.select_effects.push_back(eset[i]);
 				core.select_options.push_back(eset[i]->description);
 			}
 		}
 		if(core.select_options.size() == 1)
 			returns.ivalue[0] = 0;
-		else if(!force_select && unlimited >= 0)
-			returns.ivalue[0] = unlimited;
 		else
 			add_process(PROCESSOR_SELECT_OPTION, 0, 0, 0, sumplayer, 0);
 		return FALSE;
@@ -2087,8 +2074,6 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
 		}
 		effect* peffect = core.select_effects[returns.ivalue[0]];
 		core.units.begin()->peffect = peffect;
-		int32 unlimited = -1;
-		bool force_select = false;
 		core.select_effects.clear();
 		core.select_options.clear();
 		if(ignore_count || core.summon_count[setplayer] < get_summon_count_limit(setplayer)) {
@@ -2103,12 +2088,9 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
 				int32 new_zone = retval.size() > 1 ? retval[1] : 0x1f;
 				int32 releasable = retval.size() > 2 ? (retval[2] < 0 ? 0xff00ff + retval[2] : retval[2]) : 0xff00ff;
 				new_zone &= zone;
-				bool unchanged = (new_zone == zone);
 				if(peffect) {
-					if(new_min_tribute < (int32)min_tribute) {
+					if(new_min_tribute < (int32)min_tribute)
 						new_min_tribute = min_tribute;
-						unchanged = false;
-					}
 					if(!target->is_summonable(peffect, new_min_tribute, new_zone, releasable))
 						continue;
 				} else {
@@ -2121,25 +2103,17 @@ int32 field::mset(uint16 step, uint8 setplayer, card* target, effect* proc, uint
 						min = min_tribute;
 					if(max < min)
 						continue;
-					if(min < new_min_tribute) {
+					if(min < new_min_tribute)
 						min = new_min_tribute;
-						unchanged = false;
-					}
 					if(!check_tribute(target, min, max, 0, target->current.controler, new_zone, releasable, POS_FACEDOWN_DEFENSE))
 						continue;
 				}
-				if(unlimited < 0 && unchanged)
-					unlimited = (int32)core.select_effects.size();
-				if(eset[i]->operation)
-					force_select = true;
 				core.select_effects.push_back(eset[i]);
 				core.select_options.push_back(eset[i]->description);
 			}
 		}
 		if(core.select_options.size() == 1)
 			returns.ivalue[0] = 0;
-		else if(!force_select && unlimited >= 0)
-			returns.ivalue[0] = unlimited;
 		else
 			add_process(PROCESSOR_SELECT_OPTION, 0, 0, 0, setplayer, 0);
 		return FALSE;

processor.cpp

@@ -161,14 +161,6 @@ int32 field::process() {
 			return PROCESSOR_WAITING + pduel->bufferlen;
 		}
 	}
-	case PROCESSOR_SORT_CHAIN: {
-		if (sort_chain(it->step, it->arg1)) {
-			core.units.pop_front();
-		} else {
-			it->step++;
-		}
-		return pduel->bufferlen;
-	}
 	case PROCESSOR_SELECT_COUNTER: {
 		if (select_counter(it->step, it->arg1, it->arg2, it->arg3, it->arg4 >> 8, it->arg4 & 0xff)) {
 			core.units.pop_front();
@@ -1674,8 +1666,6 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
 		}
 		core.new_fchain_s.splice(core.new_fchain_s.begin(), core.new_fchain);
 		core.new_ochain_s.splice(core.new_ochain_s.begin(), core.new_ochain);
-		core.tpchain.clear();
-		core.ntpchain.clear();
 		core.delayed_quick.clear();
 		core.delayed_quick_break.swap(core.delayed_quick);
 		core.current_player = infos.turn_player;
@@ -1994,35 +1984,56 @@ int32 field::process_point_event(int16 step, int32 skip_trigger, int32 skip_free
 int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priority) {
 	switch(step) {
 	case 0: {
-		core.tpchain.clear();
-		core.ntpchain.clear();
-		if(!core.quick_f_chain.size())
-			return FALSE;
-		for(auto ifit = core.quick_f_chain.begin(); ifit != core.quick_f_chain.end(); ++ifit) {
+		uint8 check_player = infos.turn_player;
+		if(core.units.begin()->arg3)
+			check_player = 1 - infos.turn_player;
+		core.select_chains.clear();
+		for(auto ifit = core.quick_f_chain.begin(); ifit != core.quick_f_chain.end(); ) {
 			effect* peffect = ifit->first;
 			card* phandler = peffect->get_handler();
 			if(peffect->is_chainable(ifit->second.triggering_player) && peffect->check_count_limit(ifit->second.triggering_player)
 					&& phandler->is_has_relation(ifit->second)) {
-				if(ifit->second.triggering_player == infos.turn_player) {
-					core.tpchain.push_back(ifit->second);
-					phandler->set_status(STATUS_CHAINING, TRUE);
-					peffect->dec_count(infos.turn_player);
+				if(ifit->second.triggering_player == check_player)
+					core.select_chains.push_back(ifit->second);
 			} else {
-					core.ntpchain.push_back(ifit->second);
-					phandler->set_status(STATUS_CHAINING, TRUE);
-					peffect->dec_count(1 - infos.turn_player);
-				}
+				core.quick_f_chain.erase(ifit++);
+				continue;
 			}
+			++ifit;
 		}
-		core.quick_f_chain.clear();
-		if(core.tpchain.size() > 1)
-			add_process(PROCESSOR_SORT_CHAIN, 0, 0, 0, 1, infos.turn_player);
-		if(core.ntpchain.size() > 1)
-			add_process(PROCESSOR_SORT_CHAIN, 0, 0, 0, 0, infos.turn_player);
+		if(core.select_chains.size() == 0)
+			returns.ivalue[0] = -1;
+		else if(core.select_chains.size() == 1)
+			returns.ivalue[0] = 0;
+		else
+			add_process(PROCESSOR_SELECT_CHAIN, 0, 0, 0, check_player, 0x10000);
 		return FALSE;
 	}
 	case 1: {
-		if(core.tpchain.size() == 0 && core.ntpchain.size() == 0) {
+		if(returns.ivalue[0] == -1) {
+			if(core.quick_f_chain.size()) {
+				core.units.begin()->arg3 = TRUE;
+				core.units.begin()->step = -1;
+			} else if(core.new_chains.size()) {
+				add_process(PROCESSOR_ADD_CHAIN, 0, 0, 0, 0, 0);
+				add_process(PROCESSOR_QUICK_EFFECT, 0, 0, 0, FALSE, 1 - core.new_chains.back().triggering_player);
+				infos.priorities[0] = 0;
+				infos.priorities[1] = 0;
+				return TRUE;
+			}
+			return FALSE;
+		}
+		chain newchain = core.select_chains[returns.ivalue[0]];
+		effect* peffect = newchain.triggering_effect;
+		uint8 tp = newchain.triggering_player;
+		peffect->get_handler()->set_status(STATUS_CHAINING, TRUE);
+		peffect->dec_count(tp);
+		core.new_chains.push_back(newchain);
+		core.quick_f_chain.erase(peffect);
+		core.units.begin()->step = -1;
+		return FALSE;
+	}
+	case 2: {
 		chain newchain;
 		auto evit = core.point_event.begin();
 		bool pev = true;
@@ -2178,18 +2189,9 @@ int32 field::process_quick_effect(int16 step, int32 skip_freechain, uint8 priori
 		if(core.current_chain.size() || (core.hint_timing[0] & TIMING_ATTACK) || (core.hint_timing[1] & TIMING_ATTACK))
 			core.spe_effect[priority] = core.select_chains.size();
 		add_process(PROCESSOR_SELECT_CHAIN, 0, 0, 0, priority, core.spe_effect[priority]);
-		} else {
-			core.new_chains.splice(core.new_chains.end(), core.tpchain);
-			core.new_chains.splice(core.new_chains.end(), core.ntpchain);
-			add_process(PROCESSOR_ADD_CHAIN, 0, 0, 0, 0, 0);
-			add_process(PROCESSOR_QUICK_EFFECT, 0, 0, 0, FALSE, 1 - core.new_chains.back().triggering_player);
-			infos.priorities[0] = 0;
-			infos.priorities[1] = 0;
-			return TRUE;
-		}
 		return FALSE;
 	}
-	case 2: {
+	case 3: {
 		if(core.select_chains.size() && returns.ivalue[0] != -1) {
 			chain newchain = core.select_chains[returns.ivalue[0]];
 			core.new_chains.push_back(newchain);
@@ -4523,46 +4525,6 @@ int32 field::add_chain(uint16 step) {
 	}
 	return TRUE;
 }
-int32 field::sort_chain(uint16 step, uint8 tp) {
-	switch(step) {
-	case 0: {
-		core.select_cards.clear();
-		if(tp)
-			for(auto clit = core.tpchain.begin(); clit != core.tpchain.end(); ++clit)
-				core.select_cards.push_back(clit->triggering_effect->get_handler());
-		else
-			for(auto clit = core.ntpchain.begin(); clit != core.ntpchain.end(); ++clit)
-				core.select_cards.push_back(clit->triggering_effect->get_handler());
-		add_process(PROCESSOR_SORT_CARD, 0, 0, 0, tp ? infos.turn_player : (1 - infos.turn_player), 1);
-		return FALSE;
-	}
-	case 1: {
-		if(returns.bvalue[0] == -1)
-			return TRUE;
-		chain_list::iterator clit;
-		int32 i = 0, count;
-		if(tp) {
-			count = core.tpchain.size();
-			chain_array ch(count);
-			for(i = 0, clit = core.tpchain.begin(); i < count; ++clit, ++i)
-				ch[returns.bvalue[i]] = *clit;
-			core.tpchain.clear();
-			for(i = 0; i < count; ++i)
-				core.tpchain.push_back(ch[i]);
-		} else {
-			count = core.ntpchain.size();
-			chain_array ch(count);
-			for(i = 0, clit = core.ntpchain.begin(); i < count; ++clit, ++i)
-				ch[returns.bvalue[i]] = *clit;
-			core.ntpchain.clear();
-			for(i = 0; i < count; ++i)
-				core.ntpchain.push_back(ch[i]);
-		}
-		return TRUE;
-	}
-	}
-	return TRUE;
-}
 int32 field::solve_continuous(uint16 step, effect * peffect, uint8 triggering_player) {
 	switch(step) {
 	case 0: {