ndyd

expansions/script/c19500020.lua

@@ -21,15 +21,15 @@ end
 function c19500020.amop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
-	e1:SetTargetRange(LOCATION_ONFIELD,0)
-	e1:SetTarget(c19500020.amlimit)
-	e1:SetValue(aux.tgoval)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+	e1:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET)
+	e1:SetTargetRange(0,LOCATION_MZONE)
+	e1:SetValue(c19500020.atlimit)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
-function c19500020.amlimit(e,c)
-	return c:IsFaceup() and c:IsSetCard(0x3990,0x3991) and c:IsType(TYPE_MONSTER)
+function c19500020.atlimit(e,c)
+	return c:IsFaceup() and c:IsSetCard(0x3990,0x3991)
 end
 function c19500020.repfilter(c,tp)
 	return c:IsFaceup() and c:IsSetCard(0x3990,0x3991) and c:IsLocation(LOCATION_ONFIELD)

expansions/script/c33310101.lua

@@ -25,13 +25,13 @@ function cm.disop(e,tp)
 	local tc=Duel.SelectMatchingCard(tp,aux.disfilter1,tp,0,LOCATION_ONFIELD,1,1,nil):GetFirst()
 	if not tc then return end
 	Duel.HintSelection(rsgf.Mix2(tc))
-	local e1,e2=rsef.SV_LIMIT({c,tc},"dis,dise",nil,nil,rsreset.est)
+	local e1,e2=rsef.SV_LIMIT({c,tc},"dis,dise",nil,nil,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 	Duel.AdjustInstantly(c)
 	if tc:IsDisabled() and tc:IsType(TYPE_MONSTER) then
-		local e3=rsef.SV_INDESTRUCTABLE({c,tc},"battle",nil,nil,rsreset.est)
+		local e3=rsef.SV_INDESTRUCTABLE({c,tc},"battle",nil,nil,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		local e4=Effect.CreateEffect(c)
 		e4:SetType(EFFECT_TYPE_SINGLE)
-		e4:SetReset(rsreset.est)
+		e4:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		e4:SetCode(EFFECT_MUST_ATTACK)
 		tc:RegisterEffect(e4)
 	end