Update "Sabatiel - The Philosopher's Stone (VG)"

Counter updates were causing issues with second activation resolution.

Author: TheRazgriz

unofficial/c100000247.lua

@@ -2,7 +2,7 @@
 --Sabatiel - The Philosopher's Stone (VG)
 local s,id=GetID()
 function s.initial_effect(c)
-	--Activate
+	--Activate (Add to hand when your "Winged Kuriboh" is destroyed)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
@@ -13,7 +13,7 @@ function s.initial_effect(c)
 	e1:SetTarget(s.thtg)
 	e1:SetOperation(s.thop)
 	c:RegisterEffect(e1)
-	--Activate
+	--Activate (Add 1 card from your Deck or GY to hand OR increase your monster's ATK)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_ACTIVATE)
 	e2:SetCode(EVENT_FREE_CHAIN)
@@ -22,15 +22,15 @@ function s.initial_effect(c)
 	e2:SetOperation(s.activate)
 	c:RegisterEffect(e2)
 end
-s.listed_names={57116033} --Winged Kuriboh
+s.listed_names={57116033} --"Winged Kuriboh"
 function s.cfilter(c,tp)
 	return c:IsCode(57116033) and c:IsPreviousControler(tp)
 		and c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsPreviousPosition(POS_FACEUP)
 end
 function s.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.cfilter,1,nil,tp)
 end
-function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToHand() end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0)
 end
@@ -52,19 +52,16 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then 
 		if ct<3 then
 			return s.cost(e,tp,eg,ep,ev,re,r,rp,0) 
-				and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil)
+				and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,nil)
 		else
 			return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil)
 		end
 	end
-	ct=ct+1
 	if ct<3 then
 		s.cost(e,tp,eg,ep,ev,re,r,rp,1)
-		e:GetHandler():SetTurnCounter(ct)
-		e:SetLabel(ct)
 		e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 		e:SetProperty(0)
-		Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
+		Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK|LOCATION_GRAVE)
 	else
 		e:SetCategory(CATEGORY_ATKCHANGE)
 		e:SetProperty(EFFECT_FLAG_CARD_TARGET)
@@ -81,8 +78,12 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.activate1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
+	local ct=e:GetLabel()
+	ct=ct+1
+	c:SetTurnCounter(ct)
+	e:SetLabel(ct)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToHand,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToHand,tp,LOCATION_DECK|LOCATION_GRAVE,0,1,1,nil)
 	if #g>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
@@ -103,4 +104,4 @@ function s.activate2(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetValue(tc:GetAttack()*ct)
 		tc:RegisterEffect(e1)
 	end
-end
+end