Merge pull request #935 from salix5/patch1

fix

script/c28890974.lua

@@ -27,9 +27,10 @@ function c28890974.activate(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
 			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetType(EFFECT_TYPE_SINGLE)
+			e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 			e1:SetCode(EFFECT_SET_ATTACK)
 			e1:SetValue(atk/2)
-			e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+			e1:SetReset(RESET_EVENT+0x1fe0000)
 			tc:RegisterEffect(e1,true)
 			local e2=Effect.CreateEffect(e:GetHandler())
 			e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
@@ -37,7 +38,7 @@ function c28890974.activate(e,tp,eg,ep,ev,re,r,rp)
 			e2:SetRange(LOCATION_MZONE)
 			e2:SetCode(EVENT_PHASE+PHASE_END)
 			e2:SetOperation(c28890974.desop)
-			e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+			e2:SetReset(RESET_EVENT+0x1fe0000)
 			e2:SetCountLimit(1)
 			tc:RegisterEffect(e2,true)
 			Duel.SpecialSummonComplete()

script/c4423206.lua

@@ -35,12 +35,13 @@ function c4423206.spop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENCE)~=0 then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 		e1:SetRange(LOCATION_MZONE)
 		e1:SetCode(EVENT_PHASE+PHASE_END)
 		e1:SetOperation(c4423206.desop)
-		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+		e1:SetReset(RESET_EVENT+0x1fe0000)
 		e1:SetCountLimit(1)
-		g:GetFirst():RegisterEffect(e1)
+		g:GetFirst():RegisterEffect(e1,true)
 	end
 end
 function c4423206.desop(e,tp,eg,ep,ev,re,r,rp)

script/c64496451.lua

@@ -160,7 +160,6 @@ function c64496451.spop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e1:SetCode(EVENT_PHASE+PHASE_END)
 		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-		e1:SetReset(RESET_PHASE+PHASE_END)
 		e1:SetCountLimit(1)
 		e1:SetLabel(fid)
 		e1:SetLabelObject(sg)
@@ -174,8 +173,11 @@ end
 function c64496451.desop(e,tp,eg,ep,ev,re,r,rp)
 	local g=e:GetLabelObject()
 	local tg=g:Filter(c64496451.desfilter,nil,e:GetLabel())
-	g:DeleteGroup()
 	Duel.Destroy(tg,REASON_EFFECT)
+	if not g:IsExists(c64496451.desfilter,1,nil,e:GetLabel()) then
+		g:DeleteGroup()
+		e:Reset()
+	end
 end
 function c64496451.valcheck(e,c)
 	local g=c:GetMaterial()

script/c71645242.lua

@@ -10,7 +10,7 @@ function c71645242.initial_effect(c)
 	e4:SetDescription(aux.Stringid(71645242,0))
 	e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e4:SetRange(LOCATION_SZONE)
+	e4:SetRange(LOCATION_FZONE)
 	e4:SetCode(71645242)
 	e4:SetTarget(c71645242.sptg)
 	e4:SetOperation(c71645242.spop)
@@ -21,7 +21,7 @@ function c71645242.initial_effect(c)
 	e5:SetCategory(CATEGORY_DESTROY+CATEGORY_SPECIAL_SUMMON)
 	e5:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e5:SetType(EFFECT_TYPE_IGNITION)
-	e5:SetRange(LOCATION_SZONE)
+	e5:SetRange(LOCATION_FZONE)
 	e5:SetTarget(c71645242.sptg2)
 	e5:SetOperation(c71645242.spop2)
 	c:RegisterEffect(e5)
@@ -56,7 +56,7 @@ function c71645242.regop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RaiseEvent(eg,71645242,e,r,rp,ep,e:GetLabel())
 end
 function c71645242.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
 	Duel.SetTargetCard(eg)
 	Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)

script/c85138716.lua

@@ -41,6 +41,7 @@ function c85138716.spop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c85138716.filter,tp,LOCATION_DECK,0,nil,e,tp)
 	local dg=g:Filter(c85138716.filter2,nil,g)
 	if dg:GetCount()>=1 then
+		local fid=e:GetHandler():GetFieldID()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 		local sg=dg:Select(tp,1,1,nil)
 		local tc1=sg:GetFirst()
@@ -48,27 +49,31 @@ function c85138716.spop(e,tp,eg,ep,ev,re,r,rp)
 		local tc2=dg:Filter(Card.IsCode,nil,tc1:GetCode()):GetFirst()
 		Duel.SpecialSummonStep(tc1,0,tp,tp,false,false,POS_FACEUP)
 		Duel.SpecialSummonStep(tc2,0,tp,tp,false,false,POS_FACEUP)
-		tc1:RegisterFlagEffect(85138716,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
-		tc2:RegisterFlagEffect(85138716,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
+		tc1:RegisterFlagEffect(85138716,RESET_EVENT+0x1fe0000,0,1,fid)
+		tc2:RegisterFlagEffect(85138716,RESET_EVENT+0x1fe0000,0,1,fid)
 		Duel.SpecialSummonComplete()
 		sg:AddCard(tc2)
 		sg:KeepAlive()
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 		e1:SetCode(EVENT_PHASE+PHASE_END)
-		e1:SetReset(RESET_PHASE+PHASE_END)
 		e1:SetCountLimit(1)
+		e1:SetLabel(fid)
 		e1:SetLabelObject(sg)
 		e1:SetOperation(c85138716.desop)
 		Duel.RegisterEffect(e1,tp)
 	end
 end
-function c85138716.desfilter(c)
-	return c:GetFlagEffect(85138716)>0
+function c85138716.desfilter(c,fid)
+	return c:GetFlagEffectLabel(85138716)==fid
 end
 function c85138716.desop(e,tp,eg,ep,ev,re,r,rp)
 	local g=e:GetLabelObject()
-	local tg=g:Filter(c85138716.desfilter,nil)
-	g:DeleteGroup()
+	local tg=g:Filter(c85138716.desfilter,nil,e:GetLabel())
 	Duel.Destroy(tg,REASON_EFFECT)
+	if not g:IsExists(c85138716.desfilter,1,nil,e:GetLabel()) then
+		g:DeleteGroup()
+		e:Reset()
+	end
 end

script/c90885155.lua

@@ -140,12 +140,12 @@ function c90885155.effop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_EXTRA_ATTACK)
 	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1ff0000)
+	e1:SetReset(RESET_EVENT+0x1fc0000)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetCode(EFFECT_PIERCE)
-	e2:SetReset(RESET_EVENT+0x1ff0000)
+	e2:SetReset(RESET_EVENT+0x1fc0000)
 	c:RegisterEffect(e2)
 end
 function c90885155.valcheck(e,c)