fix

ocgcore/effect.cpp

@@ -176,7 +176,7 @@ int32 effect::is_activateable(uint8 playerid, const tevent& e, int32 neglect_con
 			if((handler->current.location & (LOCATION_ONFIELD | LOCATION_REMOVED))
 			        && (code != EVENT_FLIP) && (!handler->is_position(POS_FACEUP) || !handler->is_status(STATUS_EFFECT_ENABLED)))
 				return FALSE;
-			if(!(type & (EFFECT_TYPE_FLIP | EFFECT_TYPE_TRIGGER_F))) {
+			if(!(type & EFFECT_TYPE_TRIGGER_F)) {
 				if((code < 1132 || code > 1149) && pduel->game_field->infos.phase == PHASE_DAMAGE && !(flag & EFFECT_FLAG_DAMAGE_STEP))
 					return FALSE;
 				if((code < 1134 || code > 1136) && pduel->game_field->infos.phase == PHASE_DAMAGE_CAL && !(flag & EFFECT_FLAG_DAMAGE_CAL))
@@ -543,9 +543,9 @@ int32 effect::check_value_condition(uint32 extraargs) {
 int32 effect::get_speed() {
 	if(!(type & EFFECT_TYPE_ACTIONS))
 		return 0;
-	if(type & EFFECT_TYPE_TRIGGER_O || type & EFFECT_TYPE_TRIGGER_F || type & EFFECT_TYPE_FLIP || type & EFFECT_TYPE_IGNITION)
+	if(type & (EFFECT_TYPE_TRIGGER_O | EFFECT_TYPE_TRIGGER_F | EFFECT_TYPE_IGNITION))
 		return 1;
-	else if(type & EFFECT_TYPE_QUICK_O || type & EFFECT_TYPE_QUICK_F)
+	else if(type & (EFFECT_TYPE_QUICK_O | EFFECT_TYPE_QUICK_F))
 		return 2;
 	else if(type & EFFECT_TYPE_ACTIVATE) {
 		if(handler->data.type & TYPE_MONSTER)

ocgcore/field.h

@@ -175,10 +175,8 @@ struct processor {
 	chain_list new_fchain_s;
 	chain_list new_ochain;
 	chain_list new_ochain_s;
-	chain_list flip_chain;
 	chain_list new_fchain_b;
 	chain_list new_ochain_b;
-	chain_list flip_chain_b;
 	chain_list new_ochain_h;
 	chain_list new_chains;
 	delayed_effect_collection delayed_quick_tmp;

ocgcore/libeffect.cpp

@@ -176,8 +176,11 @@ int32 scriptlib::effect_set_type(lua_State *L) {
 		v |= EFFECT_TYPE_FIELD;
 	if(v & EFFECT_TYPE_ACTIVATE)
 		peffect->range = LOCATION_SZONE + LOCATION_HAND;
-	if(v & EFFECT_TYPE_FLIP)
+	if(v & EFFECT_TYPE_FLIP) {
 		peffect->code = EVENT_FLIP;
+		if(!(v & EFFECT_TYPE_TRIGGER_O))
+			v |= EFFECT_TYPE_TRIGGER_F;
+	}
 	peffect->type = v;
 	return 0;
 }

ocgcore/processor.cpp

@@ -1675,23 +1675,10 @@ int32 field::process_point_event(int16 step, int32 special, int32 skip_new) {
 		core.ntpchain.clear();
 		core.delayed_quick.clear();
 		core.delayed_quick_break.swap(core.delayed_quick);
-		for (auto clit = core.flip_chain.begin(); clit != core.flip_chain.end(); ++clit) {
-			effect* peffect = clit->triggering_effect;
-			if(peffect->is_chainable(clit->triggering_player)
-			        && peffect->is_activateable(clit->triggering_player, clit->evt, TRUE)) {
-				if(clit->triggering_player == infos.turn_player)
-					core.tpchain.push_back(*clit);
-				else
-					core.ntpchain.push_back(*clit);
-				peffect->handler->set_status(STATUS_CHAINING, TRUE);
-				peffect->dec_count();
-			}
-		}
 		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);
-		core.flip_chain.clear();
 		return FALSE;
 	}
 	case 1: {
@@ -2374,19 +2361,15 @@ int32 field::process_single_event() {
 						newchain.triggering_player = newchain.triggering_controler;
 				}
 				if(core.flip_delayed && ev == EVENT_FLIP) {
-					if (peffect->type & EFFECT_TYPE_TRIGGER_O) {
+					if (peffect->type & EFFECT_TYPE_TRIGGER_O)
 						core.new_ochain_b.push_back(newchain);
-					} else if (peffect->type & EFFECT_TYPE_TRIGGER_F) {
+					else
 						core.new_fchain_b.push_back(newchain);
-					} else
-						core.flip_chain_b.push_back(newchain);
 				} else {
-					if (peffect->type & EFFECT_TYPE_TRIGGER_O) {
+					if (peffect->type & EFFECT_TYPE_TRIGGER_O)
 						core.new_ochain.push_back(newchain);
-					} else if (peffect->type & EFFECT_TYPE_TRIGGER_F) {
+					else
 						core.new_fchain.push_back(newchain);
-					} else
-						core.flip_chain.push_back(newchain);
 				}
 			}
 		}
@@ -3638,7 +3621,6 @@ int32 field::process_battle_command(uint16 step) {
 		core.flip_delayed = FALSE;
 		core.new_fchain.splice(core.new_fchain.begin(), core.new_fchain_b);
 		core.new_ochain.splice(core.new_ochain.begin(), core.new_ochain_b);
-		core.flip_chain.splice(core.flip_chain.begin(), core.flip_chain_b);
 		if(core.units.begin()->arg1) {
 			raise_single_event(core.attacker, 0, EVENT_BATTLED, 0, 0, PLAYER_NONE, 0, 0);
 			if(core.attack_target)
@@ -3648,7 +3630,7 @@ int32 field::process_battle_command(uint16 step) {
 			process_instant_event();
 		}
 		if(!core.effect_damage_step || ((core.effect_damage_step != 3) && (core.current_chain.size() <= 1))) {
-			if(core.flip_chain.size() || core.new_fchain.size() || core.new_ochain.size())
+			if(core.new_fchain.size() || core.new_ochain.size())
 				add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, FALSE, FALSE);
 		} else {
 			break_effect();
@@ -3912,7 +3894,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 		pduel->write_buffer8(infos.phase);
 		raise_event((card*)0, EVENT_PREDRAW, 0, 0, 0, turn_player, 0);
 		process_instant_event();
-		if(core.new_fchain.size() || core.new_ochain.size() || core.flip_chain.size())
+		if(core.new_fchain.size() || core.new_ochain.size())
 			add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, 0, 0);
 		return FALSE;
 	}
@@ -3954,7 +3936,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 		return FALSE;
 	}
 	case 5: {
-		if(core.new_fchain.size() || core.new_ochain.size() || core.flip_chain.size() || core.instant_event.back().event_code != EVENT_PHASE_START + PHASE_STANDBY)
+		if(core.new_fchain.size() || core.new_ochain.size() || core.instant_event.back().event_code != EVENT_PHASE_START + PHASE_STANDBY)
 			add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, 0, 0);
 		add_process(PROCESSOR_PHASE_EVENT, 0, 0, 0, PHASE_STANDBY, 0);
 		return FALSE;
@@ -3969,7 +3951,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 		return FALSE;
 	}
 	case 7: {
-		if(core.new_fchain.size() || core.new_ochain.size() || core.flip_chain.size())
+		if(core.new_fchain.size() || core.new_ochain.size())
 			add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, 0, 0);
 		return FALSE;
 	}
@@ -4049,7 +4031,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 		return FALSE;
 	}
 	case 13: {
-		if(core.new_fchain.size() || core.new_ochain.size() || core.flip_chain.size())
+		if(core.new_fchain.size() || core.new_ochain.size())
 			add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, 0, 0);
 		return FALSE;
 	}
@@ -4075,7 +4057,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
 		return FALSE;
 	}
 	case 16: {
-		if(core.new_fchain.size() || core.new_ochain.size() || core.flip_chain.size())
+		if(core.new_fchain.size() || core.new_ochain.size())
 			add_process(PROCESSOR_POINT_EVENT, 0, 0, 0, 0, 0);
 		return FALSE;
 	}

script/c27189308.lua

@@ -3,8 +3,8 @@ function c27189308.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetTarget(c27189308.target)
 	e1:SetOperation(c27189308.operation)
 	c:RegisterEffect(e1)

script/c28357177.lua

@@ -4,9 +4,8 @@ function c28357177.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(28357177,0))
 	e1:SetCategory(CATEGORY_TOHAND)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetTarget(c28357177.target)
 	e1:SetOperation(c28357177.operation)
 	c:RegisterEffect(e1)

script/c30608985.lua

@@ -3,9 +3,9 @@ function c30608985.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(30608985,0))
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetTarget(c30608985.target)
 	e1:SetOperation(c30608985.operation)
 	c:RegisterEffect(e1)
@@ -17,7 +17,6 @@ function c30608985.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c30608985.spfilter(chkc,e,tp) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingTarget(c30608985.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
-	e:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectTarget(tp,c30608985.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,g:GetCount(),0,0)

script/c48659020.lua

@@ -4,9 +4,8 @@ function c48659020.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(48659020,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetTarget(c48659020.target)
 	e1:SetOperation(c48659020.operation)
 	c:RegisterEffect(e1)

script/c5220687.lua

@@ -4,8 +4,8 @@ function c5220687.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(5220687,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetTarget(c5220687.target)
 	e1:SetOperation(c5220687.operation)
 	c:RegisterEffect(e1)

script/c6104968.lua

@@ -4,8 +4,8 @@ function c6104968.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(6104968,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetTarget(c6104968.target)
 	e1:SetOperation(c6104968.operation)
 	c:RegisterEffect(e1)

script/c64734090.lua

@@ -4,8 +4,8 @@ function c64734090.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(64734090,0))
 	e1:SetCategory(CATEGORY_TOHAND)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetTarget(c64734090.tg)
 	e1:SetOperation(c64734090.op)
 	c:RegisterEffect(e1)

script/c71315423.lua

@@ -3,16 +3,16 @@ function c71315423.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_EQUIP)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e1:SetTarget(c71315423.eqtg)
 	e1:SetOperation(c71315423.eqop)
 	c:RegisterEffect(e1)
 end
 function c71315423.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsFaceup() end
-	if chk==0 then return e:GetHandler():IsLocation(LOCATION_MZONE)
+	if chk==0 then return e:GetHandler():IsRelateToEffect(e) and e:GetHandler():IsFaceup()
+		and Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 		and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 	local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil)

script/c79279397.lua

@@ -4,8 +4,8 @@ function c79279397.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(79279397,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetTarget(c79279397.target)
 	e1:SetOperation(c79279397.spop)
 	c:RegisterEffect(e1)

script/c92784374.lua

@@ -4,8 +4,8 @@ function c92784374.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(92784374,0))
 	e1:SetCategory(CATEGORY_TOHAND)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetTarget(c92784374.tg)
 	e1:SetOperation(c92784374.op)
 	c:RegisterEffect(e1)

script/c93920745.lua

@@ -4,9 +4,8 @@ function c93920745.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(93920745,0))
 	e1:SetCategory(CATEGORY_TOHAND)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
 	e1:SetTarget(c93920745.target)
 	e1:SetOperation(c93920745.operation)
 	c:RegisterEffect(e1)

script/c94230224.lua

@@ -3,9 +3,9 @@ function c94230224.initial_effect(c)
 	--flip
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(94230224,0))
-	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP_O)
-	e1:SetCode(EVENT_FLIP)
+	e1:SetCategory(CATEGORY_DAMAGE)
+	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_DELAY)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_FLIP+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCost(c94230224.cost)
 	e1:SetTarget(c94230224.target)
 	e1:SetOperation(c94230224.operation)
@@ -14,7 +14,6 @@ end
 function c94230224.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,2000) end
 	Duel.PayLPCost(tp,2000)
-	e:SetCategory(CATEGORY_DAMAGE)
 end
 function c94230224.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

script/constant.lua

@@ -216,15 +216,13 @@ EFFECT_TYPE_FIELD			=0x0002	--
 EFFECT_TYPE_EQUIP			=0x0004	--
 EFFECT_TYPE_ACTIONS			=0x0008	--
 EFFECT_TYPE_ACTIVATE		=0x0010	--
---EFFECT_TYPE_FLIP			=0x0020	--
+EFFECT_TYPE_FLIP			=0x0020	--
 EFFECT_TYPE_IGNITION		=0x0040	--
 EFFECT_TYPE_TRIGGER_O		=0x0080	--
 EFFECT_TYPE_QUICK_O			=0x0100	--
 EFFECT_TYPE_TRIGGER_F		=0x0200	--
 EFFECT_TYPE_QUICK_F			=0x0400	--
 EFFECT_TYPE_CONTINUOUS		=0x0800	--
-EFFECT_TYPE_FLIP			=EFFECT_TYPE_TRIGGER_F	--
-EFFECT_TYPE_FLIP_O			=EFFECT_TYPE_TRIGGER_O
 
 --========== Flags ==========
 EFFECT_FLAG_INITIAL			=0x0001	--