Fix "Lyrilusc - Ensemblue Robin"

Missing chkc for targeting/general script modernization

Author: TheRazgriz

official/c72971064.lua

@@ -3,88 +3,85 @@
 --Scripted by The Razgriz
 local s,id=GetID()
 function s.initial_effect(c)
-	--Must be properly SSd before reviving
 	c:EnableReviveLimit()
-	--Xyz Procedure
+	--Xyz Procedure: 2+ Level 1 monsters
 	Xyz.AddProcedure(c,nil,1,2,nil,nil,99)
-	--ATK Up
+	--This card gains 500 ATK for each material attached to it
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetValue(s.atkval)
+	e1:SetValue(function(e,c) return c:GetOverlayCount()*500 end)
 	c:RegisterEffect(e1)
-	--Return SSd monsters to hand
+	--Return 1 of your opponent's Special Summoned monsters to your opponent's hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,0))
 	e2:SetCategory(CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCondition(s.condition)
-	e2:SetCost(s.cost)
-	e2:SetTarget(s.target)
-	e2:SetOperation(s.activate)
+	e2:SetCondition(s.retopthcon)
+	e2:SetCost(aux.dxmcostgen(1,1,nil))
+	e2:SetTarget(s.retopthtg)
+	e2:SetOperation(s.retopthop)
 	c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
-	--Add 1 LL monster from GY to hand
+	--Add 1 "Lyrilusc" monster from your GY to your hand, except this card
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,1))
-	e3:SetCategory(CATEGORY_TOHAND)
+	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_LEAVE_GRAVE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_TO_GRAVE)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
-	e3:SetCondition(s.tgcon)
-	e3:SetTarget(s.tgtg)
-	e3:SetOperation(s.tgop)
+	e3:SetCondition(s.llthcon)
+	e3:SetTarget(s.llthtg)
+	e3:SetOperation(s.llthop)
 	c:RegisterEffect(e3)
 end
-s.listed_series={0xf7}
-function s.atkval(e,c)
-	return c:GetOverlayCount()*500
+s.listed_series={SET_LYRILUSC}
+function s.retopthfilter(c,e,tp)
+	return c:IsSummonPlayer(1-tp) and c:IsAbleToHand() and c:IsCanBeEffectTarget(e)	and c:IsLocation(LOCATION_MZONE)
 end
-function s.cfilter(c,e,tp)
-	return c:IsSummonPlayer(1-tp) and c:IsAbleToHand() and c:IsCanBeEffectTarget(e)
-		and c:IsLocation(LOCATION_MZONE)
+function s.retopthcon(e,tp,eg,ep,ev,re,r,rp)
+	return eg:IsExists(s.retopthfilter,1,nil,e,tp)
 end
-function s.condition(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(s.cfilter,1,nil,e,tp)
-end
-function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
-end
-function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return eg:IsExists(s.cfilter,1,nil,e,tp) end
+function s.retopthtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	if chkc then return eg:IsContains(chkc) and s.retopthfilter(chkc,e,tp) end
+	if chk==0 then return eg:IsExists(s.retopthfilter,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-	local g=eg:FilterSelect(tp,s.cfilter,1,1,nil,e,tp)
-	local tc=g:GetFirst()
-	Duel.SetTargetCard(tc)
+    	local tc=nil
+    	if #eg==1 then
+		tc=eg:GetFirst()
+		Duel.SetTargetCard(tc)
+	else
+		tc=eg:FilterSelect(tp,s.retopthfilter,1,1,nil,e,tp)
+		Duel.SetTargetCard(tc)
+	end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,tc,1,0,0)
 end
-function s.activate(e,tp,eg,ep,ev,re,r,rp)
+function s.retopthop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc and tc:IsRelateToEffect(e) then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 	end
 end
-function s.tgcon(e,tp,eg,ep,ev,re,r,rp)
+function s.llthcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return rp==1-tp and c:GetPreviousControler()==c:GetOwner()
 end
-function s.thfilter(c)
-	return c:IsSetCard(0xf7) and c:IsMonster() and c:IsAbleToHand()
+function s.llthfilter(c)
+	return c:IsSetCard(SET_LYRILUSC) and c:IsMonster() and c:IsAbleToHand()
 end
-function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function s.llthtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and s.thfilter(chkc) and chkc~=c end
-	if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,LOCATION_GRAVE,0,1,c) end
+	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and s.llthfilter(chkc) and chkc~=c end
+	if chk==0 then return Duel.IsExistingTarget(s.llthfilter,tp,LOCATION_GRAVE,0,1,c) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-	local tc=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,c)
+	local tc=Duel.SelectTarget(tp,s.llthfilter,tp,LOCATION_GRAVE,0,1,1,c)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,tc,1,0,0)
 end
-function s.tgop(e,tp,eg,ep,ev,re,r,rp)
+function s.llthop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc and tc:IsRelateToEffect(e) then
 		Duel.SendtoHand(tc,tp,REASON_EFFECT)