update

Fluorohydride/ygopro-core@ca37f8b

c19254117.lua

@@ -87,16 +87,15 @@ function c19254117.tgop(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_FIELD)
-		e1:SetCode(EFFECT_RISE_TO_FULL_HEIGHT)
+		e1:SetCode(EFFECT_ONLY_ATTACK_MONSTER)
 		e1:SetTargetRange(0,LOCATION_MZONE)
+		e1:SetValue(c19254117.atklimit)
 		e1:SetLabel(tc:GetRealFieldID())
 		e1:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e1,tp)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_ONLY_BE_ATTACKED)
-		e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET+RESET_PHASE+PHASE_END)
-		tc:RegisterEffect(e2,true)
 		tc:RegisterFlagEffect(19254117,RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET+RESET_PHASE+PHASE_END,0,0)
 	end
 end
+function c19254117.atklimit(e,c)
+	return c:GetRealFieldID()==e:GetLabel()
+end

c20436034.lua

@@ -23,13 +23,6 @@ function c20436034.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_EQUIP)
 	e4:SetCode(EFFECT_ONLY_BE_ATTACKED)
 	c:RegisterEffect(e4)
-	local e5=Effect.CreateEffect(c)
-	e5:SetType(EFFECT_TYPE_FIELD)
-	e5:SetCode(EFFECT_ONLY_ATTACK_MONSTER)
-	e5:SetRange(LOCATION_SZONE)
-	e5:SetTargetRange(0,LOCATION_MZONE)
-	e5:SetCondition(c20436034.atkcon)
-	c:RegisterEffect(e5)
 	--equip limit
 	local e6=Effect.CreateEffect(c)
 	e6:SetType(EFFECT_TYPE_SINGLE)
@@ -54,6 +47,3 @@ end
 function c20436034.eqlimit(e,c)
 	return e:GetHandlerPlayer()==c:GetControler()
 end
-function c20436034.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetEquipTarget()~=nil
-end

c22200403.lua

@@ -35,14 +35,8 @@ function c22200403.initial_effect(c)
 	c:RegisterEffect(e4)
 	local e5=e4:Clone()
 	e5:SetCode(EFFECT_MUST_ATTACK_MONSTER)
+	e5:SetValue(c22200403.atklimit)
 	c:RegisterEffect(e5)
-	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_SINGLE)
-	e6:SetCode(EFFECT_MUST_BE_ATTACKED)
-	e6:SetCondition(c22200403.effcon)
-	e6:SetValue(1)
-	e6:SetLabel(3)
-	c:RegisterEffect(e6)
 	--draw
 	local e7=Effect.CreateEffect(c)
 	e7:SetDescription(aux.Stringid(22200403,1))
@@ -82,6 +76,9 @@ function c22200403.desop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Destroy(tc,REASON_EFFECT)
 	end
 end
+function c22200403.atklimit(e,c)
+	return c==e:GetHandler()
+end
 function c22200403.drcon1(e,tp,eg,ep,ev,re,r,rp)
 	return c22200403.effcon(e)
 		and e:GetHandler():IsRelateToBattle()

c26509612.lua

@@ -33,19 +33,12 @@ function c26509612.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 	local e2=e1:Clone()
 	e2:SetCode(EFFECT_MUST_ATTACK_MONSTER)
+	e2:SetValue(c26509612.atklimit)
 	Duel.RegisterEffect(e2,tp)
-	local e3=Effect.CreateEffect(e:GetHandler())
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetCode(EFFECT_MUST_BE_ATTACKED)
-	e3:SetTargetRange(LOCATION_MZONE,0)
-	e3:SetTarget(c26509612.attg2)
-	e3:SetValue(c26509612.attg)
-	e3:SetReset(RESET_PHASE+PHASE_BATTLE)
-	Duel.RegisterEffect(e3,tp)
 end
 function c26509612.attg(e,c)
 	return c:IsLevelBelow(4)
 end
-function c26509612.attg2(e,c)
+function c26509612.atklimit(e,c)
 	return c:IsCode(74711057)
 end

c32543380.lua

@@ -19,12 +19,8 @@ function c32543380.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_MUST_ATTACK_MONSTER)
+	e3:SetValue(c32543380.atklimit)
 	c:RegisterEffect(e3)
-	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_SINGLE)
-	e4:SetCode(EFFECT_MUST_BE_ATTACKED)
-	e4:SetValue(1)
-	c:RegisterEffect(e4)
 	--special summon
 	local e5=Effect.CreateEffect(c)
 	e5:SetDescription(aux.Stringid(32543380,0))
@@ -50,6 +46,9 @@ function c32543380.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=Duel.SelectMatchingCard(tp,c32543380.spfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
 	Duel.SendtoGrave(g, REASON_COST)
 end
+function c32543380.atklimit(e,c)
+	return c==e:GetHandler()
+end
 function c32543380.descon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local a=Duel.GetAttacker()

c36033786.lua

@@ -26,21 +26,15 @@ function c36033786.posop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.ChangePosition(tc,POS_FACEUP_DEFENSE)~=0 then
+		local fid=tc:GetRealFieldID()
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetCode(EFFECT_MUST_ATTACK_MONSTER)
 		e1:SetTargetRange(LOCATION_MZONE,0)
+		e1:SetValue(c36033786.atklimit)
+		e1:SetLabel(fid)
 		e1:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e1,tp)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_FIELD)
-		e2:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e2:SetTargetRange(0,LOCATION_MZONE)
-		e2:SetTarget(c36033786.attg)
-		e2:SetLabelObject(tc)
-		e2:SetValue(1)
-		e2:SetReset(RESET_PHASE+PHASE_END)
-		Duel.RegisterEffect(e2,tp)
 		--pierce
 		local e3=Effect.CreateEffect(c)
 		e3:SetType(EFFECT_TYPE_FIELD)
@@ -51,6 +45,6 @@ function c36033786.posop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.RegisterEffect(e3,tp)
 	end
 end
-function c36033786.attg(e,c)
-	return c==e:GetLabelObject()
+function c36033786.atklimit(e,c)
+	return c:GetRealFieldID()==e:GetLabel()
 end

c48582558.lua

@@ -33,17 +33,17 @@ function c48582558.activate(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetValue(1)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e2)
-		local e3=Effect.CreateEffect(e:GetHandler())
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e3:SetValue(1)
-		e3:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET+RESET_PHASE+PHASE_END)
-		tc:RegisterEffect(e3)
+		local fid=tc:GetRealFieldID()
 		local e4=Effect.CreateEffect(e:GetHandler())
 		e4:SetType(EFFECT_TYPE_FIELD)
 		e4:SetCode(EFFECT_MUST_ATTACK_MONSTER)
 		e4:SetTargetRange(0,LOCATION_MZONE)
+		e4:SetValue(c48582558.atklimit)
+		e4:SetLabel(fid)
 		e4:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e4,tp)
 	end
 end
+function c48582558.atklimit(e,c)
+	return c:GetRealFieldID()==e:GetLabel()
+end

c67231737.lua

@@ -6,7 +6,7 @@ function c67231737.initial_effect(c)
 	--extra attack
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(67231737,0))
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_DAMAGE_STEP_END)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1)
@@ -59,18 +59,13 @@ function c67231737.operation(e,tp,eg,ep,ev,re,r,rp)
 		e0:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE)
 		a:RegisterEffect(e0)
 		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_FIELD)
-		e1:SetCode(EFFECT_MUST_ATTACK_MONSTER)
-		e1:SetTargetRange(LOCATION_MZONE,0)
-		e1:SetReset(RESET_PHASE+PHASE_BATTLE)
-		Duel.RegisterEffect(e1,tp)
-		local e2=Effect.CreateEffect(c)
-		e2:SetType(EFFECT_TYPE_FIELD)
-		e2:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e2:SetTargetRange(0,LOCATION_MZONE)
-		e2:SetTarget(aux.TargetBoolFunction(Card.IsType,TYPE_LINK))
-		e2:SetValue(1)
-		e2:SetReset(RESET_PHASE+PHASE_BATTLE)
-		Duel.RegisterEffect(e2,tp)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET)
+		e1:SetValue(c67231737.atklimit)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE)
+		a:RegisterEffect(e1)
 	end
 end
+function c67231737.atklimit(e,c)
+	return not c:IsType(TYPE_LINK)
+end

c68406755.lua

@@ -39,16 +39,8 @@ function c68406755.initial_effect(c)
 	e5:SetRange(LOCATION_MZONE)
 	e5:SetTargetRange(0,LOCATION_MZONE)
 	e5:SetCondition(c68406755.efcon)
+	e5:SetValue(c68406755.atklimit)
 	c:RegisterEffect(e5)
-	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_FIELD)
-	e6:SetCode(EFFECT_MUST_BE_ATTACKED)
-	e6:SetRange(LOCATION_MZONE)
-	e6:SetTargetRange(LOCATION_MZONE,0)
-	e6:SetCondition(c68406755.efcon)
-	e6:SetTarget(c68406755.attg)
-	e6:SetValue(1)
-	c:RegisterEffect(e6)
 end
 function c68406755.splimit(e,se,sp,st)
 	return se:GetHandler():IsSetCard(0xe2)
@@ -81,6 +73,6 @@ function c68406755.atkval(e,c)
 	local g=Duel.GetMatchingGroup(Card.IsType,c:GetControler(),LOCATION_GRAVE,0,nil,TYPE_FIELD)
 	return g:GetClassCount(Card.GetCode)*500
 end
-function c68406755.attg(e,c)
+function c68406755.atklimit(e,c)
 	return c:IsCode(68406755)
 end

c69058960.lua

@@ -48,6 +48,7 @@ function c69058960.operation(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetFieldGroup(tp,0,LOCATION_MZONE)
 	if g:GetCount()>0 then
 		Duel.ChangePosition(g,POS_FACEUP_ATTACK)
+		local fid=c:GetRealFieldID()
 		local tc=g:GetFirst()
 		while tc do
 			local e1=Effect.CreateEffect(c)
@@ -57,17 +58,16 @@ function c69058960.operation(e,tp,eg,ep,ev,re,r,rp)
 			tc:RegisterEffect(e1)
 			local e2=e1:Clone()
 			e2:SetCode(EFFECT_MUST_ATTACK_MONSTER)
+			e2:SetValue(c69058960.atklimit)
+			e2:SetLabel(fid)
 			tc:RegisterEffect(e2)
 			tc=g:GetNext()
 		end
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e3:SetValue(1)
-		e3:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET+RESET_PHASE+PHASE_END)
-		c:RegisterEffect(e3)
 	end
 end
+function c69058960.atklimit(e,c)
+	return c:GetRealFieldID()==e:GetLabel()
+end
 function c69058960.filter(c)
 	return c:IsFaceup() and c:IsCode(95442074)
 end

c86676862.lua

@@ -29,12 +29,8 @@ function c86676862.initial_effect(c)
 	c:RegisterEffect(e4)
 	local e5=e4:Clone()
 	e5:SetCode(EFFECT_MUST_ATTACK_MONSTER)
+	e5:SetValue(c86676862.atklimit)
 	c:RegisterEffect(e5)
-	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_SINGLE)
-	e6:SetCode(EFFECT_MUST_BE_ATTACKED)
-	e6:SetValue(1)
-	c:RegisterEffect(e6)
 end
 c86676862.material_setcode=0x8
 c86676862.dark_calling=true
@@ -46,5 +42,9 @@ function c86676862.ffilter(c)
 end
 function c86676862.poscon(e)
 	local ph=Duel.GetCurrentPhase()
-	return Duel.GetTurnPlayer()~=e:GetHandler():GetControler() and ph>=0x8 and ph<=0x20
+	return Duel.GetTurnPlayer()~=e:GetHandler():GetControler()
+		and ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
+end
+function c86676862.atklimit(e,c)
+	return c==e:GetHandler()
 end

c90740329.lua

@@ -23,17 +23,17 @@ end
 function c90740329.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsFaceup() and tc:IsRelateToEffect(e) then
-		local e1=Effect.CreateEffect(e:GetHandler())
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e1:SetValue(1)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-		tc:RegisterEffect(e1)
+		local fid=tc:GetRealFieldID()
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_FIELD)
 		e2:SetCode(EFFECT_MUST_ATTACK_MONSTER)
 		e2:SetTargetRange(0,LOCATION_MZONE)
+		e2:SetValue(c90740329.atklimit)
+		e2:SetLabel(fid)
 		e2:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e2,tp)
 	end
 end
+function c90740329.atklimit(e,c)
+	return c:GetRealFieldID()==e:GetLabel()
+end

c92854392.lua

@@ -23,6 +23,7 @@ end
 function c92854392.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) then
+		local fid=tc:GetRealFieldID()
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetCode(EFFECT_MUST_ATTACK)
@@ -31,13 +32,12 @@ function c92854392.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.RegisterEffect(e1,tp)
 		local e2=e1:Clone()
 		e2:SetCode(EFFECT_MUST_ATTACK_MONSTER)
+		e2:SetValue(c92854392.atklimit)
+		e2:SetLabel(fid)
 		Duel.RegisterEffect(e2,tp)
-		local e3=Effect.CreateEffect(e:GetHandler())
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e3:SetValue(1)
-		e3:SetReset(RESET_PHASE+PHASE_BATTLE+RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
-		tc:RegisterEffect(e3,true)
 		Duel.ChangeAttackTarget(tc)
 	end
 end
+function c92854392.atklimit(e,c)
+	return c:GetRealFieldID()==e:GetLabel()
+end

c95442074.lua

@@ -48,6 +48,7 @@ function c95442074.operation(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetFieldGroup(tp,0,LOCATION_MZONE)
 	if g:GetCount()>0 then
 		Duel.ChangePosition(g,POS_FACEUP_ATTACK)
+		local fid=c:GetRealFieldID()
 		local tc=g:GetFirst()
 		while tc do
 			local e1=Effect.CreateEffect(c)
@@ -57,17 +58,16 @@ function c95442074.operation(e,tp,eg,ep,ev,re,r,rp)
 			tc:RegisterEffect(e1)
 			local e2=e1:Clone()
 			e2:SetCode(EFFECT_MUST_ATTACK_MONSTER)
+			e2:SetValue(c95442074.atklimit)
+			e2:SetLabel(fid)
 			tc:RegisterEffect(e2)
 			tc=g:GetNext()
 		end
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e3:SetValue(1)
-		e3:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET+RESET_PHASE+PHASE_END)
-		c:RegisterEffect(e3)
 	end
 end
+function c95442074.atklimit(e,c)
+	return c:GetRealFieldID()==e:GetLabel()
+end
 function c95442074.filter(c)
 	return c:IsFaceup() and c:IsCode(69058960)
 end

constant.lua

@@ -442,7 +442,7 @@ EFFECT_MUST_ATTACK				=191	--必须攻击
 EFFECT_FIRST_ATTACK				=192	--必须第一个攻击
 EFFECT_ATTACK_ALL				=193	--可以攻击所有怪兽
 EFFECT_EXTRA_ATTACK				=194	--增加攻击次数
-EFFECT_MUST_BE_ATTACKED			=195	--必须攻击此卡
+EFFECT_MUST_BE_ATTACKED			=195	--N/A
 EFFECT_ONLY_BE_ATTACKED			=196	--只能攻击此卡
 EFFECT_ATTACK_DISABLED			=197	--攻击已被無效(Duel.NegateAttack()成功的標記)
 EFFECT_NO_BATTLE_DAMAGE			=200	--不会给对方造成战斗伤害
@@ -515,7 +515,7 @@ EFFECT_DISCARD_COST_CHANGE		=338	--反制陷阱捨棄手牌的代價改變(解
 EFFECT_HAND_SYNCHRO				=339	--用手牌的怪獸當作同步素材
 EFFECT_ADD_FUSION_CODE			=340	--作为融合素材时可以当作某一卡名(融合识别)
 EFFECT_ADD_FUSION_SETCODE		=341	--作为融合素材时可以当作某一字段(魔玩具改造)
-EFFECT_RISE_TO_FULL_HEIGHT		=342	--仁王立
+EFFECT_RISE_TO_FULL_HEIGHT		=342	--N/A
 EFFECT_ONLY_ATTACK_MONSTER		=343	--只能攻擊X
 EFFECT_MUST_ATTACK_MONSTER		=344	--若攻擊則必須攻擊X
 EFFECT_PATRICIAN_OF_DARKNESS	=345	--由對手選擇攻擊對象(黑暗貴族)