Merge https://github.com/Fluorohydride/ygopro into server

ocgcore/card.cpp

@@ -1190,6 +1190,7 @@ int32 card::copy_effect(uint32 code, uint32 reset, uint32 count) {
 	pduel->uncopy.clear();
 	return pduel->game_field->infos.copy_id - 1;
 }
+// add EFFECT_SET_CONTROL
 void card::reset(uint32 id, uint32 reset_type) {
 	effect* peffect;
 	if (reset_type != RESET_EVENT && reset_type != RESET_PHASE && reset_type != RESET_CODE && reset_type != RESET_COPY && reset_type != RESET_CARD)

ocgcore/field.cpp

@@ -376,6 +376,7 @@ void field::move_card(uint8 playerid, card* pcard, uint8 location, uint8 sequenc
 	}
 	add_card(playerid, pcard, location, sequence);
 }
+// add EFFECT_SET_CONTROL
 void field::set_control(card* pcard, uint8 playerid, uint16 reset_phase, uint8 reset_count) {
 	if((core.remove_brainwashing && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING)) || pcard->refresh_control_status() == playerid)
 		return;

ocgcore/operations.cpp

@@ -3727,7 +3727,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
 			target->unequip();
 		if(enable || ((ret == 1) && target->is_position(POS_FACEUP)))
 			target->enable_field_effect(TRUE);
-		adjust_instant();
+		adjust_disable_check_list();
 		return FALSE;
 	}
 	case 3: {

ocgcore/processor.cpp

@@ -5103,6 +5103,7 @@ int32 field::adjust_step(uint16 step) {
 				for(uint8 p = 0; p < 2; ++p) {
 					for(uint8 i = 0; i < 5; ++i) {
 						pcard = player[p].list_mzone[i];
+						// remove EFFECT_SET_CONTROL 
 						if(pcard && pcard->is_affected_by_effect(EFFECT_REMOVE_BRAINWASHING))
 							pcard->reset(EFFECT_SET_CONTROL, RESET_CODE);
 					}

script/c17078030.lua

@@ -20,7 +20,7 @@ function c17078030.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,1000) end
 	local lp=Duel.GetLP(tp)
 	local t={}
-	local f=math.floor((lp-1)/1000)
+	local f=math.floor((lp)/1000)
 	local l=1
 	while l<=f and l<=20 do
 		t[l]=l*1000

script/c95676943.lua

@@ -35,6 +35,6 @@ function c95676943.tgop(e,tp,eg,ep,ev,re,r,rp)
 	c:SetTurnCounter(ct)
 	if ct==3 then
 		local g=Duel.GetFieldGroup(tp,LOCATION_ONFIELD,LOCATION_ONFIELD)
-		Duel.SendtoGrave(g,REASON_EFFECT)
+		Duel.SendtoGrave(g,REASON_RULE)
 	end
 end