Push by Appveyor

expansions/script/c22250003.lua

@@ -69,7 +69,7 @@ function c22250003.efilter(e,te)
 	return te:IsActiveType(TYPE_TRAP)
 end
 function c22250003.setcfilter(c,tp,rp)
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetPreviousControler()==tp and c22250003.IsRiviera(c) and c:IsReason(REASON_EFFECT)
+	return c:IsPreviousPosition(POS_FACEUP) and c:GetPreviousControler()==tp and c22250003.IsRiviera(c) and c:IsReason(REASON_EFFECT) and c:IsType(TYPE_MONSTER)
 end
 function c22250003.setcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c22250003.setcfilter,1,nil,tp,rp)

expansions/script/c22250161.lua

@@ -9,6 +9,7 @@ function c22250161.initial_effect(c)
 	e1:SetCategory(CATEGORY_SUMMON)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1)
 	e1:SetTarget(c22250161.stg)
 	e1:SetOperation(c22250161.sop)
 	c:RegisterEffect(e1)

expansions/script/c22251501.lua

@@ -68,7 +68,7 @@ function c22251501.sfilter(c,e,tp)
 	return c22251501.IsRiviera(c) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsRace(RACE_FAIRY)
 end
 function c22251501.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c22251501.sfilter,tp,LOCATION_DECK,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+	if chk==0 then return Duel.IsExistingMatchingCard(c22251501.sfilter,tp,LOCATION_DECK,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and not e:GetHandler():IsCode(22251502) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,0,1,0,0)
 end
 function c22251501.scop(e,tp,eg,ep,ev,re,r,rp)
@@ -85,7 +85,7 @@ function c22251501.tgfilter(c)
 end
 function c22251501.tgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and c22251501.tgfilter(chkc) and chkc~=e:GetHandler() end
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) and Duel.IsExistingTarget(c22251501.tgfilter,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) and Duel.IsExistingTarget(c22251501.tgfilter,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) and not e:GetHandler():IsCode(22251502) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectTarget(tp,c22251501.tgfilter,tp,LOCATION_ONFIELD,0,1,1,e:GetHandler())
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,g,1,0,0)