byd

expansions/script/c12400057.lua

@@ -219,13 +219,13 @@ function s.op2(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.cfilters(c)
-	return  c:IsLevel(6)
+	return  c:IsLevelAbove(6)
 end
 function s.drcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.cfilters,1,e:GetHandler())
 end
 function s.filter(c,e,tp)
-	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_FIEND,RACE_BEASTWARRIOR) and c:IsType(TYPE_MONSTER) and c:IsLevel(6) and c:GetAttack()==c:GetDefense()
+	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_FIEND+RACE_BEASTWARRIOR) and c:IsType(TYPE_MONSTER) and c:IsLevel(6) and c:GetAttack()==c:GetDefense()
 		and (c:IsAbleToGrave() or (Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))
 end
 function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c33400322.lua

@@ -45,18 +45,18 @@ function cm.ckfilter1(c)
 	return   c:IsSetCard(0x5341) and c:IsFaceup()
 end
 function cm.ckop(e,tp,eg,ep,ev,re,r,rp)
-  local g2=Duel.GetMatchingGroup(cm.ckfilter1,tp,LOCATION_ONFIELD,0,nil)
-			local tc=g2:GetFirst()
-			while tc do
-				local e4=Effect.CreateEffect(e:GetHandler())
-				e4:SetType(EFFECT_TYPE_SINGLE)
-				e4:SetCode(EFFECT_IMMUNE_EFFECT)
-				e4:SetValue(cm.efilter)
-				e4:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+Duel.GetCurrentPhase())
-				e4:SetOwnerPlayer(tp)
-				tc:RegisterEffect(e4)
-				tc=g2:GetNext()
-			end
+  local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_IMMUNE_EFFECT)
+	e1:SetTargetRange(LOCATION_ONFIELD,0)
+	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x5341))
+	e1:SetValue(cm.val)
+	e1:SetReset(RESET_PHASE+Duel.GetCurrentPhase())
+	Duel.RegisterEffect(e1,tp)
+end
+function cm.val(e,te)
+	local loc=Duel.GetChainInfo(0,CHAININFO_TRIGGERING_LOCATION)
+	return loc~=LOCATION_ONFIELD and not te:IsHasType(EFFECT_TYPE_ACTIVATE)
 end
 
 function cm.Eqop1(e,tp,eg,ep,ev,re,r,rp)
@@ -131,7 +131,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 				local e4=Effect.CreateEffect(e:GetHandler())
 				e4:SetType(EFFECT_TYPE_SINGLE)
 				e4:SetCode(EFFECT_IMMUNE_EFFECT)
-				e4:SetValue(cm.efilter)
+				e4:SetValue(cm.efilter1)
 				e4:SetReset(RESET_EVENT+0x1fe0000+RESET_CHAIN)
 				e4:SetOwnerPlayer(tp)
 				tc:RegisterEffect(e4)