Update "Cyber Phoenix (Anime)"

- Added auxiliary function for "Double Snare" check
- Should check if it's an activated Spell/Trap effect that is potentially affecting it
- Slight script modernization update

Author: TheRazgriz

unofficial/c511007022.lua

@@ -3,54 +3,45 @@
 --Scripted by Lyris, modified by MLD
 local s,id=GetID()
 function s.initial_effect(c)
-	--Negate the activated effects of Spells/Traps
+	--Negate the activated effects of Spells/Traps that target a Machine monster you control
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EVENT_CHAIN_SOLVING)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetCondition(s.discon)
+	e1:SetCondition(function(e) return e:GetHandler():IsAttackPos() end)
 	e1:SetOperation(s.disop)
 	c:RegisterEffect(e1)
-	--Draw 1 card
+	--Draw 1 card when this card is destroyed and sent to the GY
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,0))
 	e2:SetCategory(CATEGORY_DRAW)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetCondition(function(e) return e:GetHandler():IsReason(REASON_DESTROY) end)
-	e2:SetTarget(s.target)
-	e2:SetOperation(s.operation)
+	e2:SetTarget(s.drtg)
+	e2:SetOperation(s.drop)
 	c:RegisterEffect(e2)
-	--Double Snare
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetCondition(s.discon)
-	e3:SetCode(3682106)
-	c:RegisterEffect(e3)
-end
-function s.discon(e)
-	return e:GetHandler():IsAttackPos()
+	--Double Snare check
+	aux.DoubleSnareValidity(c,LOCATION_MZONE)
 end
 function s.disfilter(c,p)
 	return c:IsControler(p) and c:IsFaceup() and c:IsRace(RACE_MACHINE)
 end
 function s.disop(e,tp,eg,ep,ev,re,r,rp)
-	if re:IsMonsterEffect() or not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then return end
+	if re:IsMonsterEffect() or not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) or not re:IsActivated() then return end
 	local g=Duel.GetChainInfo(ev,CHAININFO_TARGET_CARDS)
 	if g:IsExists(s.disfilter,1,nil,tp) and Duel.SelectEffectYesNo(tp,e:GetHandler(),aux.Stringid(id,1)) then
 		Duel.NegateEffect(ev)
 	end
 end
-function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
-function s.operation(e,tp,eg,ep,ev,re,r,rp)
+function s.drop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 	Duel.Draw(p,d,REASON_EFFECT)
 end