Commit 6acb216f authored by VanillaSalt's avatar VanillaSalt

Merge pull request #653 from salix5/patch2

fix
parents ca989584 beae5993
--݆h칷 --輪廻天狗
function c10028593.initial_effect(c) function c10028593.initial_effect(c)
--spsummon --spsummon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
...@@ -11,9 +11,10 @@ function c30459350.initial_effect(c) ...@@ -11,9 +11,10 @@ function c30459350.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_REMOVE) e2:SetCode(EFFECT_CANNOT_REMOVE)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetProperty(EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_SET_AVAILABLE) e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e2:SetTargetRange(1,1)
c:RegisterEffect(e2) c:RegisterEffect(e2)
-- --30459350 chk
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
e3:SetCode(30459350) e3:SetCode(30459350)
......
...@@ -35,6 +35,7 @@ function c51858306.filter(c) ...@@ -35,6 +35,7 @@ function c51858306.filter(c)
and c:IsAbleToRemove() and c:IsAbleToRemove()
end end
function c51858306.operation(e,tp,eg,ep,ev,re,r,rp) function c51858306.operation(e,tp,eg,ep,ev,re,r,rp)
if Duel.IsPlayerAffectedByEffect(tp,30459350) then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectMatchingCard(tp,c51858306.filter,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c51858306.filter,tp,LOCATION_DECK,0,1,1,nil)
local tc=g:GetFirst() local tc=g:GetFirst()
......
...@@ -66,7 +66,7 @@ function c58069384.atkcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,7 +66,7 @@ function c58069384.atkcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated() return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
end end
function c58069384.atkfilter(c) function c58069384.atkfilter(c)
return c:IsCode(70095154) and c:IsAbleToRemoveAsCost() return c:IsCode(70095154) and c:IsAbleToRemoveAsCost() and (not c:IsOnField() or c:IsFaceup())
end end
function c58069384.atkcost(e,tp,eg,ep,ev,re,r,rp,chk) function c58069384.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c58069384.atkfilter,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c58069384.atkfilter,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,nil) end
......
...@@ -55,10 +55,10 @@ function c67159705.repval(e,re,r,rp) ...@@ -55,10 +55,10 @@ function c67159705.repval(e,re,r,rp)
return bit.band(r,REASON_BATTLE)~=0 return bit.band(r,REASON_BATTLE)~=0
end end
function c67159705.eqlimit(e,c) function c67159705.eqlimit(e,c)
return c:IsSetCard(0x103) return c:IsCode(70095154) or c:IsSetCard(0x103)
end end
function c67159705.filter(c) function c67159705.filter(c)
return c:IsFaceup() and c:IsSetCard(0x103) and c:GetUnionCount()==0 return c:IsFaceup() and (c:IsCode(70095154) or c:IsSetCard(0x103))and c:GetUnionCount()==0
end end
function c67159705.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c67159705.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c67159705.filter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c67159705.filter(chkc) end
......
--カオス·ハンター --カオスハンター
function c97940434.initial_effect(c) function c97940434.initial_effect(c)
--special summon --special summon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -20,6 +20,14 @@ function c97940434.initial_effect(c) ...@@ -20,6 +20,14 @@ function c97940434.initial_effect(c)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetTargetRange(0,1) e2:SetTargetRange(0,1)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--30459350 chk
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD)
e3:SetCode(30459350)
e3:SetRange(LOCATION_MZONE)
e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e3:SetTargetRange(0,1)
c:RegisterEffect(e3)
end end
function c97940434.spfilter(c,sp) function c97940434.spfilter(c,sp)
return c:GetSummonPlayer()==sp return c:GetSummonPlayer()==sp
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment