fix

expansions/script/c10105407.lua

@@ -20,9 +20,9 @@ function c10105407.initial_effect(c)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetCountLimit(1,101054070)
-	e2:SetCondition(c10105407.thcon)
-	e2:SetTarget(c10105407.thtg)
-	e2:SetOperation(c10105407.thop)
+	e2:SetCondition(c10105407.thcon1)
+	e2:SetTarget(c10105407.thtg1)
+	e2:SetOperation(c10105407.thop1)
 	c:RegisterEffect(e2)
     end
 function c10105407.lcheck(g,lc)
@@ -44,17 +44,17 @@ function c10105407.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 	end
 end
-function c10105407.thcon(e,tp,eg,ep,ev,re,r,rp)
+function c10105407.thcon1(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c10105407.thfilter(c)
 	return c:IsRace(RACE_ZOMBIE) and c:IsLevel(1) and c:IsAttribute(ATTRIBUTE_DARK) and c:IsAbleToHand()
 end
-function c10105407.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+function c10105407.thtg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c10105407.thfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
-function c10105407.thop(e,tp,eg,ep,ev,re,r,rp)
+function c10105407.thop1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,c10105407.thfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then

expansions/script/c10105408.lua

@@ -70,6 +70,17 @@ function c10105408.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.RegisterEffect(e2,tp)
 	end
 end
+function c10105408.distg(e,c)
+	local tc=e:GetLabelObject()
+	return c:IsOriginalCodeRule(tc:GetOriginalCodeRule()) and (c:IsType(TYPE_EFFECT) or c:GetOriginalType()&TYPE_EFFECT~=0)
+end
+function c10105408.discon(e,tp,eg,ep,ev,re,r,rp)
+	local tc=e:GetLabelObject()
+	return re:IsActiveType(TYPE_MONSTER) and re:GetHandler():IsOriginalCodeRule(tc:GetOriginalCodeRule())
+end
+function c10105408.disop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.NegateEffect(ev)
+end
 function c10105408.atkter(c)
 	return c:IsPreviousLocation(LOCATION_MZONE)
 end

expansions/script/c11451938.lua

@@ -39,7 +39,7 @@ function cm.spfilter(c,se)
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local se=e:GetLabelObject():GetLabelObject()
-	return eg:IsExists(cm.spfilter,1,nil,se)
+	return eg:IsExists(cm.spfilter,1,nil,se) and not eg:IsContains(e:GetHandler())
 end
 function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentChain()>0