rar

expansions/script/c21520134.lua

@@ -37,20 +37,32 @@ function c21520134.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_SET_ATTACK_FINAL)
 		e1:SetValue(tc:GetAttack()*2)
-		e1:SetReset(RESET_EVENT+0x1fe0000)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 		tc:RegisterEffect(e1)
+		tc::RegisterFlagEffect(21520134,RESET_EVENT+RESETS_STANDARD,0,1)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e2:SetCode(EVENT_PHASE+PHASE_END)
 		e2:SetCountLimit(1)
 		e2:SetRange(LOCATION_MZONE)
+		e2:SetLabelObject(tc)
+		e2:SetCondtion(c21520134.descon)
 		e2:SetOperation(c21520134.desop)
-		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e2,tp)
 	end
 end
+function c21520134.descon(e,tp,eg,ep,ev,re,r,rp)
+	local tc=e:GetLabelObject()
+	if tc:GetFlagEffect(21520134)~=0 then
+		return true
+	else
+		e:Reset()
+		return false
+	end
+end
 function c21520134.desop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Destroy(e:GetHandler(),REASON_EFFECT)
+	Duel.Destroy(e:GetLabelObject(),REASON_EFFECT)
 end
 function c21520134.dcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() end

expansions/script/c81028004.lua

@@ -59,8 +59,7 @@ function cm.efilter(e,te)
 end
 function cm.discon(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end
-	local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)
-	return loc==LOCATION_MZONE and re:IsActiveType(TYPE_MONSTER)
+	return re:IsActiveType(TYPE_MONSTER)
 		and not re:GetHandler():IsType(TYPE_TUNER)
 		and Duel.IsChainNegatable(ev)
 end