Merge branch 'master' of https://code.mycard.moe/hiiragiguardians/ygopro-thc-cards

script/c16000006.lua

@@ -26,7 +26,7 @@ function c16000006.initial_effect(c)
 	e2:SetDescription(aux.Stringid(16000006,1))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetProperty(EFFECT_FLAG_DELAY)
+	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCountLimit(1,16000006)
@@ -102,15 +102,16 @@ function c16000006.operation(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c16000006.cfilter(c,tp)
-	return c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp and c:IsSetCard(0x5208)
+	return c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp and c:IsSetCard(0x5208) and c:IsAbleToRemoveAsCost()
 end
 function c16000006.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:Filter(c16000006.cfilter,nil,tp):GetCount()>0
 end
 function c16000006.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=eg:Filter(c16000006.cfilter,nil,tp)
-	local rc=g:GetFirst()
-	if chk==0 then return rc and rc:IsAbleToRemoveAsCost() end
+	if chk==0 then return g:GetCount()>0 end
+	local rc
+	if g:GetCount() == 1 then rc=g:GetFirst() else rc=g:Select(tp,1,1,nil):GetFirst() end
 	e:SetLabel(rc:GetLevel())
 	Duel.Remove(rc,POS_FACEUP,REASON_COST)
 end