ndyd

expansions/script/c16400001.lua

@@ -49,7 +49,7 @@ function cm.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
 end
 function cm.thfilter(c)
-	return c:IsSetCard(0x1ce0) and ( c:IsSetCard(0xce0) and c:IsType(TYPE_MONSTER) ) and c:IsAbleToHand()
+	return ( c:IsSetCard(0x1ce0) or  c:IsSetCard(0xce0) and c:IsType(TYPE_MONSTER) ) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end

expansions/script/c16400038.lua

@@ -3,8 +3,8 @@ local cm=_G["c"..m]
 --贤惠的后辈—玛修
 function cm.initial_effect(c)
 	--xyz summon
-	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0xce0),4,2)
 	c:EnableReviveLimit()
+	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0xce0),2,2) 
 	--special summon
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(m,1))

expansions/script/c64800068.lua

@@ -21,7 +21,6 @@ function cm.initial_effect(c)
 	e5:SetCode(EVENT_TO_GRAVE)
 	e5:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e5:SetCountLimit(1,m)
-	e5:SetCondition(cm.spcon1)
 	e5:SetTarget(cm.sptg1)
 	e5:SetOperation(cm.spop1)
 	c:RegisterEffect(e5)
@@ -51,9 +50,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 ----------
-function cm.spcon1(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetPreviousLocation()==LOCATION_MZONE
-end
 function cm.spfilter1(c,e,tp)
 	return c:IsLevel(7,8) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsRace(RACE_DRAGON) and not c:IsCode(m)
 end