fix

expansions/script/c93378018.lua

@@ -3,6 +3,7 @@ function c93378018.initial_effect(c)
 	aux.AddCodeList(c,93378021)
 	--Activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(93378018,0))
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
@@ -12,7 +13,7 @@ function c93378018.initial_effect(c)
 	c:RegisterEffect(e1)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(93378018,0))
+	e2:SetDescription(aux.Stringid(93378018,1))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_GRAVE)
@@ -23,10 +24,10 @@ function c93378018.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c93378018.thfilter(c)
-	return c:IsRace(RACE_AQUA) and c:IsAbleToHand()
+	return ((c:IsSetCard(0xfcb) and c:IsType(TYPE_MONSTER)) or c:IsCode(93378021)) and c:IsAbleToHand()
 end
 function c93378018.filter(c)
-	return c:IsCode(93378021) and c:IsAbleToHand()
+	return c:IsAbleToRemove()
 end
 function c93378018.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c93378018.thfilter,tp,LOCATION_DECK,0,1,nil) end
@@ -36,16 +37,11 @@ function c93378018.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,c93378018.thfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
-		if Duel.SendtoHand(g,nil,REASON_EFFECT)~=0 and Duel.ConfirmCards(1-tp,g)~=0 then
-			local tc=g:GetFirst()
-			if tc:IsSetCard(0x3fcb) and Duel.IsExistingMatchingCard(c93378018.filter,tp,LOCATION_DECK,0,1,nil)
-				and Duel.SelectYesNo(tp,aux.Stringid(93378018,1)) then
-				Duel.BreakEffect()
-				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-				local tg=Duel.SelectMatchingCard(tp,c93378018.filter,tp,LOCATION_DECK,0,1,1,nil)
-				Duel.SendtoHand(tg,nil,REASON_EFFECT)
-				Duel.ConfirmCards(1-tp,tg)
-			end
+		if Duel.SendtoHand(g,nil,REASON_EFFECT)~=0 and Duel.ConfirmCards(1-tp,g)~=0 and Duel.IsExistingMatchingCard(c93378018.filter,tp,LOCATION_HAND,0,1,nil) then
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+			local tg=Duel.SelectMatchingCard(tp,c93378018.filter,tp,LOCATION_HAND,0,1,1,nil)
+			local tc=tg:GetFirst()
+			Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
 		end
 	end
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c93378021.lua

@@ -46,13 +46,13 @@ function c93378021.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c93378021.spfilter(c,e,tp)
-	return c:IsSetCard(0xfcb) and not c:IsType(TYPE_FUSION) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return (c:IsSetCard(0xfcb) and not c:IsType(TYPE_FUSION)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c93378021.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingTarget(c93378021.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+		and Duel.IsExistingTarget(c93378021.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectTarget(tp,c93378021.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectTarget(tp,c93378021.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 end
 function c93378021.spop(e,tp,eg,ep,ev,re,r,rp)