byd

expansions/script/c35100413.lua

@@ -128,7 +128,7 @@ function c35100413.disop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c35100413.thcon2(e,tp,eg,ep,ev,re,r,rp)
-	return re:GetHandler():IsCode(35100401) or aux.IsCodeListed(re,35100401)
+	return re:GetHandler():IsCode(35100401) or aux.IsCodeListed(re:GetHandler(),35100401)
 end
 function c35100413.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToHand() end

expansions/script/c35100424.lua

@@ -100,12 +100,13 @@ function c35100424.ovltgfilter(c)
 	return (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE)) and c:IsSetCard(0x1a94) and c:IsAbleToRemoveAsCost()
 end
 function c35100424.discost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return (e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)
-		 or Duel.IsExistingMatchingCard(c35100424.ovltgfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,2,nil)) end
-		local result=Duel.SelectOption(tp,aux.Stringid(35100424,2),aux.Stringid(35100424,3))
-		if result==0 then
+	local b1=e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)
+	local b2=Duel.IsExistingMatchingCard(c35100424.ovltgfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,2,nil))
+	if chk==0 then return b1 or b2 end
+	local op=aux.SelectFromOptions(tp,{b1,aux.Stringid(35100424,2)},{b2,aux.Stringid(35100424,3)})
+	if op==1 then
 		e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
-		else
+	elseif op==2 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		local g=Duel.SelectMatchingCard(tp,c35100424.ovltgfilter,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,2,2,nil)
 		Duel.Remove(g,POS_FACEUP,REASON_COST)

expansions/script/c35100434.lua

@@ -74,7 +74,7 @@ function c35100434.lpop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c35100434.cfilter(c)
-	return c:IsSetCard(0x1a94) and c:IsAbleToRemoveAsCost() and c:IsControler(tp)
+	return c:IsSetCard(0x1a94) and c:IsAbleToRemoveAsCost()
 end
 function c35100434.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c35100434.cfilter,tp,LOCATION_GRAVE,0,1,nil) end