wocaonima

expansions/script/c33720054.lua

@@ -71,7 +71,11 @@ function s.sumlimit(e,c,sump,sumtype,sumpos,targetp,se)
 end
 
 function s.matchtype(c,typ)
-	return ((typ==TYPE_SPELL or typ==TYPE_TRAP) and c:GetType()==typ) or c:GetType()&typ==typ
+	if typ==TYPE_SPELL or typ==TYPE_TRAP then
+		return c:GetType()==typ
+	else
+		return c:GetType()&typ==typ
+	end
 end
 
 s.thchecks=aux.CreateChecks(s.matchtype,{TYPE_NORMAL+TYPE_MONSTER,TYPE_EFFECT+TYPE_MONSTER,TYPE_PENDULUM+TYPE_MONSTER,TYPE_SPELL,TYPE_CONTINUOUS+TYPE_SPELL,TYPE_EQUIP+TYPE_SPELL,TYPE_FIELD+TYPE_SPELL,

expansions/script/c37900017.lua

@@ -10,19 +10,13 @@ function c37900017.initial_effect(c)
 	e0:SetCountLimit(2)
 	e0:SetValue(c37900017.valcon)
 	c:RegisterEffect(e0)
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(37900017,1))
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_IMMUNE_EFFECT)
-	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT)
-	e1:SetRange(LOCATION_SZONE)
-	e1:SetValue(c37900017.efilter)	
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_GRANT)
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_IMMUNE_EFFECT)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_SZONE,0)
 	e2:SetTarget(c37900017.mattg)
-	e2:SetLabelObject(e1)
+	e2:SetValue(c37900017.efilter)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
 	e3:SetType(EFFECT_TYPE_IGNITION)