Script updates

- Replace some values used by cards that declared card types with their corresponding constants
- Allow "SPYGAL Misty" to select its targets in any cancelable order

Author: NaimSantos

official/c54719828.lua

@@ -2,15 +2,15 @@
 --Number 16: Shock Master
 local s,id=GetID()
 function s.initial_effect(c)
-	--xyz summon
-	Xyz.AddProcedure(c,nil,4,3)
 	c:EnableReviveLimit()
-	--act limit
+	--Xyz Summon Procedure: 3 Level 4 monsters
+	Xyz.AddProcedure(c,nil,4,3)
+	--Players cannot activate cards with the declared type
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetType(EFFECT_TYPE_IGNITION)
-	e1:SetCountLimit(1)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1)
 	e1:SetCost(Cost.DetachFromSelf(1))
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.operation)
@@ -20,7 +20,7 @@ s.xyz_number=16
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,1))
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	e:SetLabel(Duel.SelectOption(tp,DECLTYPE_MONSTER,DECLTYPE_SPELL,DECLTYPE_TRAP))
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -50,4 +50,4 @@ function s.aclimit2(e,re,tp)
 end
 function s.aclimit3(e,re,tp)
 	return re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:IsTrapEffect()
-end
+end

official/c94096018.lua

@@ -34,7 +34,7 @@ function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1)
 		and Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CARDTYPE)
-	e:SetLabel(Duel.SelectOption(tp,70,71,72))
+	e:SetLabel(Duel.SelectOption(tp,DECLTYPE_MONSTER,DECLTYPE_SPELL,DECLTYPE_TRAP))
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 end
@@ -49,19 +49,20 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Draw(p,d,REASON_EFFECT)
 	end
 end
-function s.thfilter(c)
-	return c:IsFaceup() and c:IsCode(41091257) and c:IsAbleToHand()
+function s.thfilter(c,e,tp)
+	return (c:IsControler(1-tp) or (c:IsCode(41091257) and c:IsFaceup()))
+		and c:IsAbleToHand() and c:IsCanBeEffectTarget(e)
+end
+function s.rescon(sg,e,tp,mg)
+	return sg:FilterCount(Card.GetControler,nil)==#sg
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
-	if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,LOCATION_MZONE,0,1,nil)
-		and Duel.IsExistingTarget(Card.IsAbleToHand,tp,0,LOCATION_MZONE,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-	local g1=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_MZONE,0,1,1,nil)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-	local g2=Duel.SelectTarget(tp,Card.IsAbleToHand,tp,0,LOCATION_MZONE,1,1,nil)
-	g1:Merge(g2)
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g1,2,0,0)
+	local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil,e,tp)
+	if chk==0 then return #g>=2 and aux.SelectUnselectGroup(g,e,tp,2,2,s.rescon,0) end
+	local rg=aux.SelectUnselectGroup(g,e,tp,2,2,s.rescon,1,tp,HINTMSG_TARGET)
+	Duel.SetTargetCard(rg)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,rg,#rg,0,0)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetTargetCards(e)