update handling of effect activated in deck

Fluorohydride/ygopro-core@c1f6937

c10028593.lua

@@ -13,7 +13,7 @@ function c10028593.initial_effect(c)
 end
 function c10028593.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c10028593.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c10698416.lua

@@ -41,7 +41,7 @@ function c10698416.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c10698416.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
 end
 function c10698416.filter1(c,e,tp)

c1278431.lua

@@ -60,7 +60,7 @@ function c1278431.actcon(e)
 end
 function c1278431.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
 end
 function c1278431.spfilter(c,e,tp)

c13629812.lua

@@ -63,7 +63,7 @@ end
 function c13629812.retcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=c:GetFirstCardTarget()
-	if tc and tc:IsLocation(LOCATION_REMOVED) and not c:IsLocation(LOCATION_DECK) then
+	if tc and tc:IsLocation(LOCATION_REMOVED) then
 		e:SetLabelObject(tc)
 		tc:CreateEffectRelation(e)
 		return true

c15710054.lua

@@ -38,7 +38,7 @@ function c15710054.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c15710054.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
 end
 function c15710054.filter1(c,e,tp)

c19801646.lua

@@ -38,7 +38,7 @@ end
 function c19801646.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return (c:IsReason(REASON_BATTLE) or (c:GetReasonPlayer()==1-tp and c:IsReason(REASON_EFFECT)))
-		and c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
+		and c:IsPreviousPosition(POS_FACEUP)
 end
 function c19801646.thfilter(c)
 	return c:IsLevel(7) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToHand()

c20358953.lua

@@ -6,7 +6,7 @@ function c20358953.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
-	e1:SetCode(EVENT_LEAVE_FIELD)
+	e1:SetCode(EVENT_DESTROYED)
 	e1:SetCondition(c20358953.spcon)
 	e1:SetTarget(c20358953.sptg)
 	e1:SetOperation(c20358953.spop)
@@ -14,8 +14,8 @@ function c20358953.initial_effect(c)
 end
 function c20358953.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsReason(REASON_DESTROY) and c:IsReason(REASON_EFFECT) and not c:IsLocation(LOCATION_DECK)
-		and c:GetPreviousControler()==tp and c:IsPreviousPosition(POS_FACEUP) and c:GetReasonPlayer()==1-tp
+	return c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
+		and c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_ONFIELD) and c:IsPreviousPosition(POS_FACEUP)
 end
 function c20358953.filter(c,e,tp)
 	return c:IsLevelBelow(4) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

c24419823.lua

@@ -14,7 +14,7 @@ function c24419823.initial_effect(c)
 end
 function c24419823.thcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return not c:IsLocation(LOCATION_DECK) and c:IsPreviousPosition(POS_FACEUP)
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c24419823.filter(c)
 	return c:IsType(TYPE_FIELD) and c:IsAbleToHand()

c34471458.lua

@@ -51,8 +51,7 @@ function c34471458.lvop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c34471458.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsReason(REASON_EFFECT) and not c:IsLocation(LOCATION_DECK)
-		and c:IsPreviousPosition(POS_FACEUP)
+	return c:IsReason(REASON_EFFECT) and c:IsPreviousPosition(POS_FACEUP)
 end
 function c34471458.spfilter(c,e,tp)
 	return c:IsSetCard(0x31) and c:IsCanBeSpecialSummoned(e,0x8,tp,false,false)

c43583400.lua

@@ -55,7 +55,7 @@ function c43583400.sumop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c43583400.drcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return rp==1-tp and c:IsReason(REASON_EFFECT) and c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK) and c:GetPreviousControler()==tp
+	return rp==1-tp and c:IsReason(REASON_EFFECT) and c:IsPreviousPosition(POS_FACEUP) and c:GetPreviousControler()==tp
 end
 function c43583400.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c4404099.lua

@@ -44,7 +44,7 @@ end
 function c4404099.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local ct=e:GetLabelObject():GetLabel()
 	e:SetLabel(ct)
-	return ct>0 and not e:GetHandler():IsLocation(LOCATION_DECK)
+	return ct>0
 end
 function c4404099.filter(c)
 	return c:IsFaceup() and c:IsRace(RACE_FISH+RACE_SEASERPENT)

c46083111.lua

@@ -39,7 +39,7 @@ function c46083111.tgop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c46083111.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
 end
 function c46083111.filter1(c,e,tp)

c47126872.lua

@@ -42,7 +42,7 @@ function c47126872.rmop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c47126872.setcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject():GetLabelObject()
-	return tc and tc:GetFlagEffect(47126872)~=0 and not e:GetHandler():IsLocation(LOCATION_DECK)
+	return tc and tc:GetFlagEffect(47126872)~=0
 end
 function c47126872.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c4779091.lua

@@ -81,7 +81,7 @@ function c4779091.desop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c4779091.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c4779091.filter(c,e,tp)
 	return c:IsCode(31764700) and c:IsCanBeSpecialSummoned(e,0,tp,true,true)

c48680970.lua

@@ -122,7 +122,7 @@ function c48680970.efilter(e,re)
 end
 function c48680970.descon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c48680970.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c51205763.lua

@@ -48,7 +48,7 @@ function c51205763.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c51205763.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
 end
 function c51205763.filter1(c,e,tp)

c56562619.lua

@@ -88,7 +88,7 @@ function c56562619.rmop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c56562619.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c56562619.spfilter(c,e,tp)
 	return c:GetFlagEffect(56562619)~=0

c57288708.lua

@@ -61,7 +61,7 @@ function c57288708.tgop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c57288708.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and not c:IsSummonType(SUMMON_TYPE_SPECIAL) and not c:IsLocation(LOCATION_DECK)
+	return c:IsPreviousPosition(POS_FACEUP) and not c:IsSummonType(SUMMON_TYPE_SPECIAL)
 end
 function c57288708.spfilter(c,e,tp)
 	return c:IsSetCard(0xfd) and not c:IsCode(57288708) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

c59255742.lua

@@ -100,7 +100,7 @@ function c59255742.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c59255742.ctcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c59255742.ctfilter(c)
 	return c:GetControler()~=c:GetOwner()

c68989981.lua

@@ -37,7 +37,7 @@ function c68989981.tgop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c68989981.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return rp==1-tp and c:IsReason(REASON_EFFECT) and c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK) and c:GetPreviousControler()==tp
+	return rp==1-tp and c:IsReason(REASON_EFFECT) and c:IsPreviousPosition(POS_FACEUP) and c:GetPreviousControler()==tp
 end
 function c68989981.spfilter(c,e,tp)
 	return c:IsRace(RACE_ZOMBIE) and c:IsLevelBelow(4) and not c:IsCode(68989981) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)

c69105797.lua

@@ -50,7 +50,7 @@ function c69105797.atkfilter(e,c)
 end
 function c69105797.ccon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c69105797.cfilter(c)
 	return c:IsFaceup() and c:IsSummonType(SUMMON_TYPE_SPECIAL)

c70630741.lua

@@ -12,15 +12,10 @@ function c70630741.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_BATTLE_DESTROYED)
-	e2:SetCondition(c70630741.condition)
 	e2:SetTarget(c70630741.target)
 	e2:SetOperation(c70630741.operation)
 	c:RegisterEffect(e2)
 end
-function c70630741.condition(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	return not c:IsLocation(LOCATION_DECK) and c:IsReason(REASON_BATTLE)
-end
 function c70630741.filter(c,tp)
 	return c:IsFaceup() and c:GetOwner()==tp and c:IsControlerCanBeChanged()
 end

c71829750.lua

@@ -5,7 +5,6 @@ function c71829750.initial_effect(c)
 	e1:SetDescription(aux.Stringid(71829750,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetProperty(0,EFFECT_FLAG2_NAGA)
 	e1:SetCode(EVENT_TO_DECK)
 	e1:SetCondition(c71829750.spcon)
 	e1:SetTarget(c71829750.sptg)

c73702909.lua

@@ -6,14 +6,10 @@ function c73702909.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_BATTLE_DESTROYED)
-	e1:SetCondition(c73702909.condition)
 	e1:SetTarget(c73702909.target)
 	e1:SetOperation(c73702909.operation)
 	c:RegisterEffect(e1)
 end
-function c73702909.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():IsLocation(LOCATION_DECK)
-end
 function c73702909.spfilter(c,e,tp)
 	return c:IsLevelBelow(2) and c:IsRace(RACE_WARRIOR) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE)
 end

c73734821.lua

@@ -91,7 +91,7 @@ function c73734821.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c73734821.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsPreviousPosition(POS_FACEUP) and not e:GetHandler():IsLocation(LOCATION_DECK)
+	return e:GetHandler():IsPreviousPosition(POS_FACEUP)
 end
 function c73734821.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() end

c77841719.lua

@@ -20,7 +20,7 @@ function c77841719.initial_effect(c)
 end
 function c77841719.condition(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and not c:IsLocation(LOCATION_DECK)
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:GetPreviousControler()==tp and rp==1-tp
 end
 function c77841719.filter(c)

c78371393.lua

@@ -65,7 +65,7 @@ function c78371393.descon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
 function c78371393.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return not e:GetHandler():IsLocation(LOCATION_DECK) end
+	if chk==0 then return true end
 	if not Duel.CheckReleaseGroup(tp,nil,1,nil) then
 		Duel.SetOperationInfo(0,CATEGORY_DESTROY,e:GetHandler(),1,0,0)
 	end

c80794697.lua

@@ -14,7 +14,7 @@ function c80794697.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c80794697.condition(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsPreviousPosition(POS_FACEUP) and not e:GetHandler():IsLocation(LOCATION_DECK)
+	return e:GetHandler():IsPreviousPosition(POS_FACEUP)
 end
 function c80794697.tgfilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsRace(RACE_CYBERSE) and c:IsDiscardable()

c83293307.lua

@@ -40,7 +40,7 @@ function c83293307.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c83293307.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
 end
 function c83293307.filter1(c,e,tp)

c87997872.lua

@@ -12,18 +12,13 @@ function c87997872.initial_effect(c)
 	e2:SetDescription(aux.Stringid(87997872,0))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetRange(LOCATION_HAND)
-	e2:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
+	e2:SetRange(LOCATION_HAND+LOCATION_DECK)
 	e2:SetCode(EVENT_LEAVE_FIELD)
 	e2:SetCondition(c87997872.spcon)
 	e2:SetCost(c87997872.cost)
 	e2:SetTarget(c87997872.sptg)
 	e2:SetOperation(c87997872.spop)
 	c:RegisterEffect(e2)
-	local e3=e2:Clone()
-	e3:SetRange(LOCATION_DECK)
-	e3:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE,EFFECT_FLAG2_NAGA)
-	c:RegisterEffect(e3)
 	--atkup
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(87997872,1))

c88316955.lua

@@ -38,7 +38,7 @@ function c88316955.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function c88316955.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 		and c:IsReason(REASON_EFFECT) and c:GetReasonPlayer()==1-tp
 end
 function c88316955.filter1(c,e,tp)

c9047460.lua

@@ -24,7 +24,7 @@ function c9047460.initial_effect(c)
 end
 function c9047460.tkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP) and c:GetLocation()~=LOCATION_DECK
+	return c:IsPreviousPosition(POS_FACEUP)
 end
 function c9047460.tktg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

c9156135.lua

@@ -22,7 +22,6 @@ function c9156135.initial_effect(c)
 	e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e4:SetCode(EVENT_BATTLE_DESTROYED)
-	e4:SetCondition(c9156135.condition)
 	e4:SetTarget(c9156135.target)
 	e4:SetOperation(c9156135.operation)
 	c:RegisterEffect(e4)
@@ -43,9 +42,6 @@ function c9156135.addc(e,tp,eg,ep,ev,re,r,rp)
 		tc:AddCounter(0x1,1)
 	end
 end
-function c9156135.condition(e,tp,eg,ep,ev,re,r,rp)
-	return not e:GetHandler():IsLocation(LOCATION_DECK) and e:GetHandler():IsReason(REASON_BATTLE)
-end
 function c9156135.spfilter(c,e,tp)
 	return c:IsLevelBelow(2) and c:IsRace(RACE_SPELLCASTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE)
 end

c92377303.lua

@@ -6,18 +6,13 @@ function c92377303.initial_effect(c)
 	e1:SetDescription(aux.Stringid(92377303,0))
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e1:SetRange(LOCATION_HAND)
-	e1:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
+	e1:SetRange(LOCATION_HAND+LOCATION_DECK)
 	e1:SetCode(EVENT_CUSTOM+71625222)
 	e1:SetCondition(c92377303.spcon)
 	e1:SetCost(c92377303.cost)
 	e1:SetTarget(c92377303.sptg)
 	e1:SetOperation(c92377303.spop)
 	c:RegisterEffect(e1)
-	local e2=e1:Clone()
-	e2:SetRange(LOCATION_DECK)
-	e2:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE,EFFECT_FLAG2_NAGA)
-	c:RegisterEffect(e2)
 	--to hand
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(92377303,1))

c94982447.lua

@@ -37,8 +37,7 @@ function c94982447.initial_effect(c)
 end
 function c94982447.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsPreviousPosition(POS_FACEUP)
-		and c:IsSummonType(SUMMON_TYPE_ADVANCE) and not c:IsLocation(LOCATION_DECK)
+	return c:IsPreviousPosition(POS_FACEUP) and c:IsSummonType(SUMMON_TYPE_ADVANCE)
 end
 function c94982447.spfilter(c,e,tp)
 	return c:IsSetCard(0xf9) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)

c97617181.lua

@@ -69,7 +69,7 @@ end
 function c97617181.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=c:GetFirstCardTarget()
-	if tc and tc:IsLocation(LOCATION_MZONE) and tc:IsFaceup() and not c:IsLocation(LOCATION_DECK) then
+	if tc and tc:IsLocation(LOCATION_MZONE) and tc:IsFaceup() then
 		e:SetLabelObject(tc)
 		tc:CreateEffectRelation(e)
 		return true

c98301564.lua

@@ -43,8 +43,7 @@ function c98301564.cfilter(c)
 	return c:IsType(TYPE_TRAP) and c:IsType(TYPE_COUNTER) and c:IsAbleToHand()
 end
 function c98301564.regtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return not e:GetHandler():IsLocation(LOCATION_DECK)
-		and Duel.IsExistingMatchingCard(c98301564.cfilter,tp,LOCATION_DECK,0,3,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c98301564.cfilter,tp,LOCATION_DECK,0,3,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK)
 end
 function c98301564.regop(e,tp,eg,ep,ev,re,r,rp)

constant.lua

@@ -288,7 +288,7 @@ EFFECT_FLAG_COF				=0x20000000 --N/A
 EFFECT_FLAG_CVAL_CHECK		=0x40000000	--N/A
 EFFECT_FLAG_IMMEDIATELY_APPLY	=0x80000000	--卡在发动时效果就立即适用（卡通王國）
 
-EFFECT_FLAG2_NAGA			=0x0001 --特殊情况时发动不会被无效（神卡纳迦的特殊处理）
+EFFECT_FLAG2_NAGA			=0x0001 --N/A
 EFFECT_FLAG2_COF			=0x0002 --通常魔法卡在MP1以外发动（邪恶的仪式的特殊处理）
 --========== Codes ==========	--对永续性效果表示效果类型(EFFECT开头)，对诱发型效果表示触发效果的事件/时点(EVENT开头)
 EFFECT_IMMUNE_EFFECT			=1		--效果免疫