Commit c99139e0 authored by POLYMER's avatar POLYMER

fix

parent 82c49de3
...@@ -33,8 +33,8 @@ end ...@@ -33,8 +33,8 @@ end
function cm.immval(e,te) function cm.immval(e,te)
local c=e:GetHandler() local c=e:GetHandler()
local tp=c:GetControler() local tp=c:GetControler()
local eset={c:IsHasEffect(0x20000000+m)} local eset={c:IsHasEffect(EFFECT_FLAG_EFFECT+m)}
local res=(te:GetOwner()~=c) local res=(te:GetOwner()~=c and c:IsFacedown())
local ctns=false local ctns=false
if not te:IsHasType(EFFECT_TYPE_ACTIONS) then if not te:IsHasType(EFFECT_TYPE_ACTIONS) then
for _,se in pairs(eset) do for _,se in pairs(eset) do
...@@ -45,7 +45,7 @@ function cm.immval(e,te) ...@@ -45,7 +45,7 @@ function cm.immval(e,te)
local flag=c:GetFlagEffect(m) local flag=c:GetFlagEffect(m)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(0x20000000+m) e1:SetCode(EFFECT_FLAG_EFFECT+m)
e1:SetLabelObject(te) e1:SetLabelObject(te)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
...@@ -65,7 +65,7 @@ end ...@@ -65,7 +65,7 @@ end
function cm.fliptg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.fliptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
local c=e:GetHandler() local c=e:GetHandler()
local eset={c:IsHasEffect(0x20000000+m)} local eset={c:IsHasEffect(EFFECT_FLAG_EFFECT+m)}
if #eset>0 then if #eset>0 then
if rp>=2 then if rp>=2 then
if tp==0 then rp=1 end if tp==0 then rp=1 end
......
...@@ -61,7 +61,6 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,6 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
e2:SetCategory(CATEGORY_TODECK) e2:SetCategory(CATEGORY_TODECK)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1,id)
if tc:IsOriginalSetCard(0x6224) then if tc:IsOriginalSetCard(0x6224) then
e2:SetCondition(aux.NOT(s.effcon)) e2:SetCondition(aux.NOT(s.effcon))
end end
......
...@@ -124,7 +124,6 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp) ...@@ -124,7 +124,6 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp)
e2:SetCategory(CATEGORY_TODECK) e2:SetCategory(CATEGORY_TODECK)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1,id)
if rc:IsOriginalSetCard(0x6224) then if rc:IsOriginalSetCard(0x6224) then
e2:SetCondition(aux.NOT(s.effcon)) e2:SetCondition(aux.NOT(s.effcon))
end end
......
...@@ -87,7 +87,6 @@ function s.plop(e,tp,eg,ep,ev,re,r,rp) ...@@ -87,7 +87,6 @@ function s.plop(e,tp,eg,ep,ev,re,r,rp)
e2:SetCategory(CATEGORY_TODECK) e2:SetCategory(CATEGORY_TODECK)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1,id)
if tc:IsOriginalSetCard(0x6224) then if tc:IsOriginalSetCard(0x6224) then
e2:SetCondition(aux.NOT(s.effcon)) e2:SetCondition(aux.NOT(s.effcon))
end end
......
...@@ -59,7 +59,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,7 +59,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetCategory(CATEGORY_TODECK) e2:SetCategory(CATEGORY_TODECK)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1,id)
if tc:IsOriginalSetCard(0x6224) then if tc:IsOriginalSetCard(0x6224) then
e2:SetCondition(aux.NOT(s.effcon)) e2:SetCondition(aux.NOT(s.effcon))
end end
......
...@@ -51,7 +51,7 @@ function s.adjustop(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,7 +51,7 @@ function s.adjustop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_ADD_TYPE) e1:SetCode(EFFECT_ADD_TYPE)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CANNOT_DISABLE)
e1:SetRange(LOCATION_SZONE) e1:SetRange(LOCATION_SZONE)
e1:SetCondition(function(e) return Duel.IsPlayerAffectedByEffect(e:GetHandler(),id) end) e1:SetCondition(function(e) return Duel.IsPlayerAffectedByEffect(e:GetHandlerPlayer(),id) end)
e1:SetValue(TYPE_TRAP) e1:SetValue(TYPE_TRAP)
e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET) e1:SetReset(RESET_EVENT|RESETS_STANDARD&~RESET_TURN_SET)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
......
...@@ -73,7 +73,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -73,7 +73,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
e2:SetCategory(CATEGORY_TODECK) e2:SetCategory(CATEGORY_TODECK)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1,id)
if tc:IsOriginalSetCard(0x6224) then if tc:IsOriginalSetCard(0x6224) then
e2:SetCondition(aux.NOT(s.effcon)) e2:SetCondition(aux.NOT(s.effcon))
end end
......
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