fix

expansions/script/c16104202.lua

@@ -86,7 +86,7 @@ function cm.filter1(c)
 end
 function cm.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE)  and cm.filter1(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(cm.filter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,e:GetHandler()) end
+	if chk==0 then return Duel.IsExistingTarget(cm.filter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,e:GetHandler()) and Duel.GetLocationCount(tp,LOCATION_SZONE) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELECT)
 	Duel.SelectTarget(tp,cm.filter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,e:GetHandler())
 	Duel.SetOperationInfo(0,CATEGORY_EQUIP,nil,1,tp,LOCATION_MZONE)

expansions/script/c16104214.lua

@@ -87,6 +87,12 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp)
 			e4:SetReset(RESET_EVENT+RESETS_STANDARD)
 			e4:SetValue(0)
 			tc:RegisterEffect(e4)
+			local e6=Effect.CreateEffect(c)
+			e6:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+			e6:SetType(EFFECT_TYPE_SINGLE)
+			e6:SetCode(EFFECT_CANNOT_ATTACK)
+			e6:SetReset(RESET_EVENT+RESETS_STANDARD)
+			tc:RegisterEffect(e6)
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)

expansions/script/c16104224.lua

@@ -17,7 +17,7 @@ function cm.descon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_MZONE,0,1,nil)
 end
 function cm.desfilter(c)
-	return ((not c:IsRace(RACE_WARRIOR))and c:IsFaceup()) or c:IsFacedown() or c:IsLocation(LOCATION_SZONE) or c:islocation(LOCATION_FZONE)
+	return not (c:IsRace(RACE_WARRIOR) and c:IsLocation(LOCATION_MZONE) and c:IsFaceup())
 end
 --function cm.ntrfilter(c)
 	--return c:IsRace(RACE_WARRIOR) and c:IsControlerCanBeChanged() and c:IsFaceup()