eme

expansions/script/c16114203.lua

@@ -74,7 +74,7 @@ function cm.drcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep==tp
 end
 function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)

expansions/script/c33400205.lua

@@ -54,12 +54,12 @@ function c33400205.spop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c33400205.spfilter1(c,e,tp)
 	local rk=c:GetRank()
-	return c:IsFaceup() and c:IsSetCard(0xba) and c:IsType(TYPE_XYZ)
+	return c:IsFaceup() and c:IsSetCard(0x341) and c:IsType(TYPE_XYZ)
 		and Duel.IsExistingMatchingCard(c33400205.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,rk+2)
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_XMATERIAL)
 end
 function c33400205.spfilter2(c,e,tp,mc,rk)
-	return c:IsRank(rk) and c:IsSetCard(0xba) and mc:IsCanBeXyzMaterial(c)
+	return c:IsRank(rk) and c:IsSetCard(0x341) and mc:IsCanBeXyzMaterial(c)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
 end
 function c33400205.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

expansions/script/c33400210.lua

@@ -44,9 +44,9 @@ function cm.filter(c,e,tp)
 	return c:IsSetCard(0x6342) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_DECK) and cm.filter(chkc,e,tp) end
+	if chkc then return true end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and (Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) or Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,e,tp)) end
+		and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end
 	local g=Duel.GetMatchingGroup(cm.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 end