tnndx

expansions/script/c81046034.lua

@@ -60,19 +60,23 @@ function cm.atkop(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+RESET_PHASE+PHASE_END,2)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,2)
 		tc:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 		e2:SetRange(LOCATION_MZONE)
 		e2:SetCode(EFFECT_IMMUNE_EFFECT)
-		e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,2)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,2)
 		e2:SetValue(cm.efilter)
 		e2:SetOwnerPlayer(tp)
 		tc:RegisterEffect(e2)
 	end
 end
+function cm.efilter(e,re)
+	if Duel.GetCurrentPhase()==PHASE_MAIN2 then return false end
+	return e:GetOwnerPlayer()~=re:GetOwnerPlayer()
+end
 function cm.dfilter(c)
 	return c:IsSummonType(SUMMON_TYPE_SPECIAL)
 end