Update "Secret Mission"

- Place target property in target function to properly raise events for when it might target a monster instead of it being inherent in the initial effect
--Code modernization update

Author: TheRazgriz

unofficial/c511001331.lua

@@ -4,17 +4,13 @@ local s,id=GetID()
 function s.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e1:SetCondition(s.condition)
+	e1:SetCondition(function(e) return Duel.IsTurnPlayer(1-e:GetHandlerPlayer()) end)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
 	c:RegisterEffect(e1)
 end
-function s.condition(e,tp,eg,ep,ev,re,r,rp)
-	return tp~=Duel.GetTurnPlayer()
-end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local opt=0
@@ -24,6 +20,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		opt=Duel.SelectOption(1-tp,aux.Stringid(15552258,1))+1
 	end
 	if opt==0 then
+		e:SetProperty(EFFECT_FLAG_CARD_TARGET)
 		local g=Duel.GetFieldGroup(tp,LOCATION_MZONE,0)
 		local sg=g:RandomSelect(1-tp,1)
 		Duel.SetTargetCard(sg)
@@ -32,12 +29,13 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local opt=e:GetLabel()
-	if opt==1 then
-		Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE_STEP,1)
+	if opt==0 then
+		local tc=Duel.GetFirstTarget()
+		if tc and tc:IsRelateToEffect(e) then
+			Duel.CalculateDamage(Duel.GetAttacker(),tc)
+		end
+	else
+		Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE|PHASE_BATTLE_STEP,1)
 		return
 	end
-	local tc=Duel.GetFirstTarget()
-	if tc and tc:IsRelateToEffect(e) then
-		Duel.CalculateDamage(Duel.GetAttacker(),tc)
-	end
 end