Merge pull request #1387 from nekrozar/patch-1

fix EFFECT_MUST_BE_ATTACKED

script/c22200403.lua

@@ -37,7 +37,7 @@ function c22200403.initial_effect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE)
 	e5:SetCode(EFFECT_MUST_BE_ATTACKED)
 	e5:SetCondition(c22200403.effcon)
-	e5:SetValue(1)
+	e5:SetValue(aux.imval1)
 	e5:SetLabel(3)
 	c:RegisterEffect(e5)
 	local e6=Effect.CreateEffect(c)

script/c26509612.lua

@@ -44,7 +44,7 @@ function c26509612.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e3,tp)
 end
 function c26509612.attg(e,c)
-	return c:IsLevelBelow(4)
+	return c:IsLevelBelow(4) and not c:IsImmuneToEffect(e)
 end
 function c26509612.attg2(e,c)
 	return c:IsCode(74711057)

script/c32543380.lua

@@ -22,7 +22,7 @@ function c32543380.initial_effect(c)
 	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e3:SetCode(EFFECT_MUST_BE_ATTACKED)
 	e3:SetRange(LOCATION_MZONE)
-	e3:SetValue(1)
+	e3:SetValue(aux.imval1)
 	c:RegisterEffect(e3)
 	--special summon
 	local e4=Effect.CreateEffect(c)

script/c86676862.lua

@@ -32,7 +32,7 @@ function c86676862.initial_effect(c)
 	e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e5:SetCode(EFFECT_MUST_BE_ATTACKED)
 	e5:SetRange(LOCATION_MZONE)
-	e5:SetValue(1)
+	e5:SetValue(aux.imval1)
 	c:RegisterEffect(e5)
 end
 function c86676862.splimit(e,se,sp,st)

script/c90740329.lua

@@ -26,7 +26,7 @@ function c90740329.activate(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_MUST_BE_ATTACKED)
-		e1:SetValue(1)
+		e1:SetValue(aux.imval1)
 		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e1)
 	end

script/utility.lua

@@ -1147,7 +1147,7 @@ function Auxiliary.chainreg(e,tp,eg,ep,ev,re,r,rp)
 		e:GetHandler():RegisterFlagEffect(1,RESET_EVENT+0x1fc0000+RESET_CHAIN,0,1)
 	end
 end
---default filter for EFFECT_CANNOT_BE_BATTLE_TARGET
+--default filter for EFFECT_CANNOT_BE_BATTLE_TARGET/EFFECT_MUST_BE_ATTACKED
 function Auxiliary.imval1(e,c)
 	return not c:IsImmuneToEffect(e)
 end