ybb

expansions/script/c33700373.lua

@@ -31,18 +31,20 @@ function c33700373.condition(e,tp,eg,ep,ev,re,r,rp)
 	return ep~=tp and Duel.GetAttackTarget()==nil
 end
 function c33700373.operation(e,tp,eg,ep,ev,re,r,rp)
-	local e3=Effect.CreateEffect(e:GetHandler())
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e3:SetReset(RESET_PHASE+PHASE_END,2)
-	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e3:SetTargetRange(0xff,0xff)
-	e3:SetTarget(c33700373.tg)
-	e3:SetValue(1)
-	Duel.RegisterEffect(e3,tp)
+	local rct=1
+	if Duel.GetTurnPlayer()~=tp then rct=2 end
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+	e1:SetTargetRange(0xff,0xff)
+	e1:SetTarget(c33700373.tglimit)
+	e1:SetValue(aux.tgoval)
+	e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,rct)
+	Duel.RegisterEffect(e1,tp)
 end
-function c33700373.tg(e,re,rp)
-	return re:GetHandler()~=e:GetOwner() and rp==1-e:GetHandlerPlayer()
+function c33700373.tglimit(e,c)
+	return not (c==e:GetHandler() and c:IsFaceup() and c:IsOnField())
 end
 function c33700373.damcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()