watele

expansions/script/c85402430.lua

@@ -86,9 +86,7 @@ function c85402430.xyzop(e,tp,chk)
 	Duel.RegisterFlagEffect(tp,85402430,RESET_PHASE+PHASE_END,0,1)
 end
 function c85402430.fl(c)
-	return (c:IsSetCard(0x3e45) and c:IsType(TYPE_MONSTER) and c:IsCanBeXyzMaterial(nil)
--- and not c:IsExtraDeckMonster()
-) or c:IsSetCard(0x6e45)
+	return (c:IsSetCard(0x3e45) and c:IsType(TYPE_MONSTER) and c:IsCanBeXyzMaterial(nil) and not c:IsExtraDeckMonster()) or c:IsSetCard(0x6e45)
 end
 function c85402430.sprcon(e,c)
 	if c==nil then return true end
@@ -291,7 +289,6 @@ function c85402430.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 		local ng=Duel.GetOperatedGroup()
 		ng:KeepAlive()
 		e:SetLabelObject(ng) 
-		e:SetLabel(ng:GetFirst():GetCode())
 	elseif Duel.GetMatchingGroupCount(c85402430.fllll2,tp,LOCATION_DECK+LOCATION_GRAVE,0,nil)<=0 then
 		g:Remove(c85402430.chk2,nil)
 		local mg=g:Select(tp,1,1,nil)
@@ -305,8 +302,11 @@ function c85402430.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 		Duel.SendtoGrave(mg,REASON_COST)
 		local ng=Duel.GetOperatedGroup()
 		ng:KeepAlive()
-		e:SetLabelObject(ng) 
-		e:SetLabel(ng:GetFirst():GetCode())
+		e:SetLabelObject(ng)
+		local nc=ng:GetFirst()
+		if nc:IsType(TYPE_MONSTER) then
+			e:SetLabel(nc:GetCode())
+		end
 	end
 end
 function c85402430.filter1(c,e,tp)