fix "cannot be effect target"

a65e6195 · DailyShana · cf2966bc · a65e6195 · a65e6195 · a65e6195
Commit a65e6195 authored Dec 30, 2016 by DailyShana
28 changed files
--- a/c1644289.lua
+++ b/c1644289.lua
@@ -13,6 +13,7 @@ function c1644289.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_EQUIP)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetValue(c1644289.tglimit)
 	c:RegisterEffect(e2)
 	--Equip limit

--- a/c17985575.lua
+++ b/c17985575.lua
@@ -5,6 +5,7 @@ function c17985575.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e1:SetTarget(c17985575.etarget)
 	e1:SetValue(1)

--- a/c18386170.lua
+++ b/c18386170.lua
@@ -48,7 +48,7 @@ function c18386170.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c18386170.tgval(e,re,rp)
-	return rp~=e:GetHandlerPlayer() and not re:GetHandler():IsImmuneToEffect(e)
+	return rp~=e:GetHandlerPlayer()
 end
 function c18386170.cfilter(c)
 	return c:IsSetCard(0xb1) and c:IsAbleToGraveAsCost()

--- a/c19870120.lua
+++ b/c19870120.lua
@@ -18,7 +18,7 @@ function c19870120.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
+	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetTarget(c19870120.target)

--- a/c20920083.lua
+++ b/c20920083.lua
@@ -20,7 +20,7 @@ function c20920083.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
+	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetCondition(c20920083.con)

--- a/c2521011.lua
+++ b/c2521011.lua
@@ -26,6 +26,7 @@ function c2521011.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e4:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetTargetRange(LOCATION_MZONE,0)
 	e4:SetTarget(aux.TargetBoolFunction(Card.IsRace,RACE_BEASTWARRIOR))

--- a/c25796442.lua
+++ b/c25796442.lua
@@ -16,6 +16,7 @@ function c25796442.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetValue(c25796442.tgval)
 	c:RegisterEffect(e3)
 	local e4=e2:Clone()

--- a/c269012.lua
+++ b/c269012.lua
@@ -8,15 +8,15 @@ function c269012.initial_effect(c)
 	--cannot be target
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c269012.target)
 	e2:SetValue(1)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
-	e3:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e3:SetValue(1)
+	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	c:RegisterEffect(e3)
 	--damage
 	local e4=Effect.CreateEffect(c)

--- a/c27527047.lua
+++ b/c27527047.lua
@@ -5,12 +5,12 @@ function c27527047.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetTargetRange(LOCATION_MZONE,0)
 	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x2f))
 	e1:SetValue(c27527047.tgval)
 	c:RegisterEffect(e1)
 end
 function c27527047.tgval(e,re,rp)
-	local tp=e:GetHandler():GetControler()
-	return tp~=rp and re:GetHandler():IsType(TYPE_MONSTER)
+	return rp~=e:GetHandlerPlayer() and re:IsActiveType(TYPE_MONSTER)
 end
--- a/c27813661.lua
+++ b/c27813661.lua
@@ -10,6 +10,7 @@ function c27813661.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e2:SetRange(LOCATION_FZONE)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetTargetRange(LOCATION_SZONE,0)
 	e2:SetTarget(c27813661.tgtg)
 	e2:SetValue(aux.tgoval)

--- a/c28124263.lua
+++ b/c28124263.lua
@@ -22,6 +22,7 @@ function c28124263.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e3:SetRange(LOCATION_MZONE)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetCondition(c28124263.cond)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x26))

--- a/c28369508.lua
+++ b/c28369508.lua
@@ -43,16 +43,17 @@ end
 function c28369508.activate(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e1:SetTargetRange(LOCATION_ONFIELD,0)
 	e1:SetTarget(c28369508.tgfilter)
-	e1:SetValue(aux.tgoval)
+	e1:SetValue(1)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 	local e2=e1:Clone()
-	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e2:SetValue(1)
+	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
+	e2:SetValue(aux.tgoval)
 	Duel.RegisterEffect(e2,tp)
 end
 function c28369508.tgfilter(e,c)

--- a/c39890958.lua
+++ b/c39890958.lua
@@ -30,6 +30,7 @@ function c39890958.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_EQUIP)
 	e4:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e4:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e4:SetValue(aux.tgoval)
 	c:RegisterEffect(e4)
 	--spsummon

--- a/c42291297.lua
+++ b/c42291297.lua
@@ -24,6 +24,7 @@ function c42291297.initial_effect(c)
 	--cannot be target
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetValue(aux.tgoval)
 	c:RegisterEffect(e3)
 	--damage

--- a/c46008667.lua
+++ b/c46008667.lua
@@ -26,6 +26,7 @@ function c46008667.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_EQUIP)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetValue(aux.tgoval)
 	c:RegisterEffect(e3)
 	--Equip limit

--- a/c50527144.lua
+++ b/c50527144.lua
@@ -21,7 +21,7 @@ end
 function c50527144.activate(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e1:SetTargetRange(LOCATION_ONFIELD,0)
 	e1:SetTarget(c50527144.tgfilter)
@@ -29,7 +29,8 @@ function c50527144.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 	local e2=e1:Clone()
-	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetValue(1)
 	Duel.RegisterEffect(e2,tp)
 end

--- a/c52738610.lua
+++ b/c52738610.lua
@@ -12,6 +12,7 @@ function c52738610.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetTarget(c52738610.tgtg)
 	e2:SetValue(aux.tgoval)

--- a/c54358015.lua
+++ b/c54358015.lua
@@ -19,13 +19,18 @@ function c54358015.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetTargetRange(LOCATION_ONFIELD,0)
 	e2:SetTarget(c54358015.tgtg)
 	e2:SetValue(aux.tgoval)
 	c:RegisterEffect(e2)
 	--indes
-	local e3=e2:Clone()
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetTargetRange(LOCATION_ONFIELD,0)
+	e3:SetTarget(c54358015.tgtg)
 	e3:SetValue(c54358015.indval)
 	c:RegisterEffect(e3)
 end

--- a/c54631665.lua
+++ b/c54631665.lua
@@ -10,6 +10,7 @@ function c54631665.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e2:SetRange(LOCATION_FZONE)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetTargetRange(LOCATION_ONFIELD,0)
 	e2:SetTarget(c54631665.tgtg)
 	e2:SetValue(aux.tgoval)

--- a/c59048135.lua
+++ b/c59048135.lua
@@ -20,6 +20,7 @@ function c59048135.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e3:SetRange(LOCATION_FZONE)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e3:SetTarget(c59048135.etarget)
 	e3:SetValue(c59048135.evalue)

--- a/c67328336.lua
+++ b/c67328336.lua
@@ -10,6 +10,7 @@ function c67328336.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e2:SetRange(LOCATION_FZONE)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x3013))
 	e2:SetValue(c67328336.effval)

--- a/c7183277.lua
+++ b/c7183277.lua
@@ -4,7 +4,7 @@ function c7183277.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e1:SetProperty(EFFECT_FLAG_IGNORE_RANGE)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTarget(c7183277.etarget)
 	e1:SetValue(1)

--- a/c75779210.lua
+++ b/c75779210.lua
@@ -8,6 +8,7 @@ function c75779210.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetTargetRange(LOCATION_SZONE,LOCATION_SZONE)
 	e1:SetTarget(c75779210.uttg)
 	e1:SetValue(1)

--- a/c77797992.lua
+++ b/c77797992.lua
@@ -13,7 +13,7 @@ function c77797992.initial_effect(c)
 	--cannot be target
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetCondition(c77797992.cond)
@@ -21,7 +21,8 @@ function c77797992.initial_effect(c)
 	e2:SetValue(1)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
-	e3:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
+	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetValue(1)
 	c:RegisterEffect(e3)
 end

--- a/c82627406.lua
+++ b/c82627406.lua
@@ -26,6 +26,7 @@ function c82627406.initial_effect(c)
 	--cannot be target
 	local e3=e2:Clone()
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetValue(aux.tgoval)
 	c:RegisterEffect(e3)
 end

--- a/c85080444.lua
+++ b/c85080444.lua
@@ -48,15 +48,16 @@ end
 function c85080444.indop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	e1:SetTarget(c85080444.tg)
 	e1:SetTargetRange(LOCATION_MZONE,0)
+	e1:SetValue(c85080444.tgvalue)
 	e1:SetReset(RESET_PHASE+PHASE_END)
-	e1:SetValue(aux.tgoval)
 	Duel.RegisterEffect(e1,tp)
 	local e2=e1:Clone()
-	e2:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e2:SetValue(c85080444.tgvalue)
+	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+	e2:SetValue(aux.tgoval)
 	Duel.RegisterEffect(e2,tp)
 end
 function c85080444.tgvalue(e,re,rp)

--- a/c87564935.lua
+++ b/c87564935.lua
@@ -24,6 +24,7 @@ function c87564935.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_EQUIP)
 	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e3:SetCondition(aux.IsUnionState)
 	e3:SetValue(c87564935.efilter1)
 	c:RegisterEffect(e3)

--- a/c96457619.lua
+++ b/c96457619.lua
@@ -10,6 +10,7 @@ function c96457619.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 	e2:SetRange(LOCATION_SZONE)
+	e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c96457619.etarget)
 	e2:SetValue(1)