tnndx

expansions/script/c21520140.lua

@@ -96,7 +96,7 @@ function c21520140.reset(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c21520140.thfilter(c)
-	return c:IsAbleToHand() and c:IsSetCard(0x5491) and c:IsType(TYPE_MONSTER)
+	return c:IsAbleToHand() and c:IsSetCard(0x5491)
 end
 function c21520140.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() end

expansions/script/c33711107.lua

@@ -65,8 +65,9 @@ function cm.initial_effect(c)
 	e5:SetCode(EFFECT_DRAW_COUNT)
 	e5:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e5:SetRange(LOCATION_FZONE)
+	e5:SetCondition(cm.drcon)
 	e5:SetTargetRange(1,1)
-	e5:SetValue(cm.drval)
+	e5:SetValue(2)
 	c:RegisterEffect(e5)
 	--recover
 	local e6=Effect.CreateEffect(c)
@@ -142,15 +143,10 @@ function cm.sumval(e,c)
 	local sp=cm.GetNorthPlayer(e:GetHandler(),e:GetHandlerPlayer())
 	return c:IsControler(sp)
 end
-function cm.drval(e)
+function cm.drcon(e,tp) 
 	local tp=Duel.GetTurnPlayer()
 	local sp=cm.GetNorthPlayer(e:GetHandler(),e:GetHandlerPlayer())
-	local dr=Duel.GetDrawCount(tp)
-	if tp==1-sp then
-		return 2
-	else
-		return dr
-	end
+	return  tp==1-sp
 end
 function cm.rmcon(e,tp,eg,ep,ev,re,r,rp)
 	local sp=cm.GetNorthPlayer(e:GetHandler(),tp)

expansions/script/c69696918.lua

@@ -42,7 +42,7 @@ function cm.gf(g,lc)
 	return g:IsExists(Card.IsRace,1,nil,RACE_SPELLCASTER)
 end
 function cm.LConditionFilter(c,f,lc)
-	if c:IsLocation(LOCATION_EXTRA) then return c:IsCanBeLinkMaterial(lc) and (not f or f(c)) and c:IsFaceup() end
+	if c:IsLocation(LOCATION_EXTRA) then return c:IsCanBeLinkMaterial(lc) and (not f or f(c)) and c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) end
 	return c:IsCanBeLinkMaterial(lc) and (not f or f(c))
 end
 function cm.GetLinkMaterials(tp,f,lc)