Merge branch 'master' of git.mycard.moe:alstroemeria-silentlove/ygopro-222DIY-cards

expansions/script/c47344580.lua

@@ -23,7 +23,7 @@ function s.plfilter(c)
 	return c:IsCode(47344564)
 end
 function s.splimitoath(e,c)
-	return c:IsLocation(LOCATION_GRAVE+LOCATION_HAND) and c:IsType(TYPE_MONSTER) and not (c:IsSetCard(0x43e) or c:IsSetCard(0x43f))
+	return c:IsLocation(LOCATION_GRAVE+LOCATION_HAND) and not (c:IsSetCard(0x43e) or c:IsSetCard(0x43f))
 end
 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(id,tp,ACTIVITY_SPSUMMON)==0
@@ -35,7 +35,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	e1:SetTargetRange(1,0)
-	e1:SetValue(s.splimitoath)
+	e1:SetTarget(s.splimitoath)
 	Duel.RegisterEffect(e1,tp)
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_EXTRA,0,1,1,nil,tp)
@@ -70,5 +70,5 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.splimit(e,c)
-	return not (c:IsType(TYPE_SYNCHRO) or c:IsType(TYPE_XYZ)) and c:IsLocation(LOCATION_EXTRA)
+	return not c:IsType(TYPE_SYNCHRO+TYPE_XYZ) and c:IsLocation(LOCATION_EXTRA)
 end
\ No newline at end of file