Commit fa7780e3 authored by mercury233's avatar mercury233 Committed by DailyShana

fix A-Assault Core etc (#533)

parent 555ce420
...@@ -16,7 +16,6 @@ function c23265594.initial_effect(c) ...@@ -16,7 +16,6 @@ function c23265594.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c23265594.uncon)
e2:SetTarget(c23265594.sptg) e2:SetTarget(c23265594.sptg)
e2:SetOperation(c23265594.spop) e2:SetOperation(c23265594.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -37,7 +36,6 @@ function c23265594.initial_effect(c) ...@@ -37,7 +36,6 @@ function c23265594.initial_effect(c)
e5:SetType(EFFECT_TYPE_EQUIP) e5:SetType(EFFECT_TYPE_EQUIP)
e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e5:SetCode(EFFECT_DESTROY_SUBSTITUTE) e5:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e5:SetCondition(c23265594.uncon)
e5:SetValue(1) e5:SetValue(1)
c:RegisterEffect(e5) c:RegisterEffect(e5)
--eqlimit --eqlimit
...@@ -48,9 +46,6 @@ function c23265594.initial_effect(c) ...@@ -48,9 +46,6 @@ function c23265594.initial_effect(c)
e6:SetValue(c23265594.eqlimit) e6:SetValue(c23265594.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c23265594.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c23265594.eqlimit(e,c) function c23265594.eqlimit(e,c)
return c:IsRace(RACE_MACHINE) or e:GetHandler():GetEquipTarget()==c return c:IsRace(RACE_MACHINE) or e:GetHandler():GetEquipTarget()==c
end end
......
...@@ -16,7 +16,6 @@ function c30012506.initial_effect(c) ...@@ -16,7 +16,6 @@ function c30012506.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c30012506.uncon)
e2:SetTarget(c30012506.sptg) e2:SetTarget(c30012506.sptg)
e2:SetOperation(c30012506.spop) e2:SetOperation(c30012506.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -25,7 +24,6 @@ function c30012506.initial_effect(c) ...@@ -25,7 +24,6 @@ function c30012506.initial_effect(c)
e3:SetType(EFFECT_TYPE_EQUIP) e3:SetType(EFFECT_TYPE_EQUIP)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetCode(EFFECT_DESTROY_SUBSTITUTE) e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e3:SetCondition(c30012506.uncon)
e3:SetValue(c30012506.repval) e3:SetValue(c30012506.repval)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--immune --immune
...@@ -52,9 +50,6 @@ function c30012506.initial_effect(c) ...@@ -52,9 +50,6 @@ function c30012506.initial_effect(c)
e6:SetValue(c30012506.eqlimit) e6:SetValue(c30012506.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c30012506.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c30012506.filter(c) function c30012506.filter(c)
return c:IsFaceup() and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT) return c:IsFaceup() and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT)
end end
......
...@@ -16,7 +16,6 @@ function c3405259.initial_effect(c) ...@@ -16,7 +16,6 @@ function c3405259.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c3405259.uncon)
e2:SetTarget(c3405259.sptg) e2:SetTarget(c3405259.sptg)
e2:SetOperation(c3405259.spop) e2:SetOperation(c3405259.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -25,7 +24,6 @@ function c3405259.initial_effect(c) ...@@ -25,7 +24,6 @@ function c3405259.initial_effect(c)
e3:SetType(EFFECT_TYPE_EQUIP) e3:SetType(EFFECT_TYPE_EQUIP)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetCode(EFFECT_DESTROY_SUBSTITUTE) e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e3:SetCondition(c3405259.uncon)
e3:SetValue(c3405259.repval) e3:SetValue(c3405259.repval)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--immune --immune
...@@ -52,9 +50,6 @@ function c3405259.initial_effect(c) ...@@ -52,9 +50,6 @@ function c3405259.initial_effect(c)
e6:SetValue(c3405259.eqlimit) e6:SetValue(c3405259.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c3405259.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c3405259.filter(c) function c3405259.filter(c)
return c:IsFaceup() and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT) return c:IsFaceup() and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT)
end end
......
...@@ -16,7 +16,6 @@ function c39890958.initial_effect(c) ...@@ -16,7 +16,6 @@ function c39890958.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c39890958.uncon)
e2:SetTarget(c39890958.sptg) e2:SetTarget(c39890958.sptg)
e2:SetOperation(c39890958.spop) e2:SetOperation(c39890958.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -25,7 +24,6 @@ function c39890958.initial_effect(c) ...@@ -25,7 +24,6 @@ function c39890958.initial_effect(c)
e3:SetType(EFFECT_TYPE_EQUIP) e3:SetType(EFFECT_TYPE_EQUIP)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetCode(EFFECT_DESTROY_SUBSTITUTE) e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e3:SetCondition(c39890958.uncon)
e3:SetValue(c39890958.repval) e3:SetValue(c39890958.repval)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--untargetable --untargetable
...@@ -52,9 +50,6 @@ function c39890958.initial_effect(c) ...@@ -52,9 +50,6 @@ function c39890958.initial_effect(c)
e6:SetValue(c39890958.eqlimit) e6:SetValue(c39890958.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c39890958.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c39890958.filter(c) function c39890958.filter(c)
return c:IsFaceup() and c:IsRace(RACE_MACHINE) return c:IsFaceup() and c:IsRace(RACE_MACHINE)
end end
......
...@@ -16,7 +16,6 @@ function c64500000.initial_effect(c) ...@@ -16,7 +16,6 @@ function c64500000.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c64500000.uncon)
e2:SetTarget(c64500000.sptg) e2:SetTarget(c64500000.sptg)
e2:SetOperation(c64500000.spop) e2:SetOperation(c64500000.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -37,7 +36,6 @@ function c64500000.initial_effect(c) ...@@ -37,7 +36,6 @@ function c64500000.initial_effect(c)
e5:SetType(EFFECT_TYPE_EQUIP) e5:SetType(EFFECT_TYPE_EQUIP)
e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e5:SetCode(EFFECT_DESTROY_SUBSTITUTE) e5:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e5:SetCondition(c64500000.uncon)
e5:SetValue(c64500000.repval) e5:SetValue(c64500000.repval)
c:RegisterEffect(e5) c:RegisterEffect(e5)
--eqlimit --eqlimit
...@@ -48,9 +46,6 @@ function c64500000.initial_effect(c) ...@@ -48,9 +46,6 @@ function c64500000.initial_effect(c)
e6:SetValue(c64500000.eqlimit) e6:SetValue(c64500000.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c64500000.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c64500000.repval(e,re,r,rp) function c64500000.repval(e,re,r,rp)
return bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0 return bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0
end end
......
...@@ -16,7 +16,6 @@ function c65622692.initial_effect(c) ...@@ -16,7 +16,6 @@ function c65622692.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c65622692.uncon)
e2:SetTarget(c65622692.sptg) e2:SetTarget(c65622692.sptg)
e2:SetOperation(c65622692.spop) e2:SetOperation(c65622692.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -37,7 +36,6 @@ function c65622692.initial_effect(c) ...@@ -37,7 +36,6 @@ function c65622692.initial_effect(c)
e5:SetType(EFFECT_TYPE_EQUIP) e5:SetType(EFFECT_TYPE_EQUIP)
e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e5:SetCode(EFFECT_DESTROY_SUBSTITUTE) e5:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e5:SetCondition(c65622692.uncon)
e5:SetValue(c65622692.repval) e5:SetValue(c65622692.repval)
c:RegisterEffect(e5) c:RegisterEffect(e5)
--eqlimit --eqlimit
...@@ -48,9 +46,6 @@ function c65622692.initial_effect(c) ...@@ -48,9 +46,6 @@ function c65622692.initial_effect(c)
e6:SetValue(c65622692.eqlimit) e6:SetValue(c65622692.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c65622692.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c65622692.repval(e,re,r,rp) function c65622692.repval(e,re,r,rp)
return bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0 return bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0
end end
......
...@@ -16,7 +16,6 @@ function c77411244.initial_effect(c) ...@@ -16,7 +16,6 @@ function c77411244.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c77411244.uncon)
e2:SetTarget(c77411244.sptg) e2:SetTarget(c77411244.sptg)
e2:SetOperation(c77411244.spop) e2:SetOperation(c77411244.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -25,7 +24,6 @@ function c77411244.initial_effect(c) ...@@ -25,7 +24,6 @@ function c77411244.initial_effect(c)
e3:SetType(EFFECT_TYPE_EQUIP) e3:SetType(EFFECT_TYPE_EQUIP)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetCode(EFFECT_DESTROY_SUBSTITUTE) e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e3:SetCondition(c77411244.uncon)
e3:SetValue(c77411244.repval) e3:SetValue(c77411244.repval)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--immune --immune
...@@ -52,9 +50,6 @@ function c77411244.initial_effect(c) ...@@ -52,9 +50,6 @@ function c77411244.initial_effect(c)
e6:SetValue(c77411244.eqlimit) e6:SetValue(c77411244.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c77411244.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c77411244.filter(c) function c77411244.filter(c)
return c:IsFaceup() and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT) return c:IsFaceup() and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT)
end end
......
...@@ -16,7 +16,6 @@ function c79538761.initial_effect(c) ...@@ -16,7 +16,6 @@ function c79538761.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c79538761.uncon)
e2:SetTarget(c79538761.sptg) e2:SetTarget(c79538761.sptg)
e2:SetOperation(c79538761.spop) e2:SetOperation(c79538761.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -25,7 +24,6 @@ function c79538761.initial_effect(c) ...@@ -25,7 +24,6 @@ function c79538761.initial_effect(c)
e3:SetType(EFFECT_TYPE_EQUIP) e3:SetType(EFFECT_TYPE_EQUIP)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetCode(EFFECT_DESTROY_SUBSTITUTE) e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e3:SetCondition(c79538761.uncon)
e3:SetValue(c79538761.repval) e3:SetValue(c79538761.repval)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--add type --add type
...@@ -54,9 +52,6 @@ function c79538761.initial_effect(c) ...@@ -54,9 +52,6 @@ function c79538761.initial_effect(c)
e7:SetValue(1) e7:SetValue(1)
c:RegisterEffect(e7) c:RegisterEffect(e7)
end end
function c79538761.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c79538761.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c79538761.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler() local c=e:GetHandler()
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and chkc:IsFaceup() end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and chkc:IsFaceup() end
......
...@@ -16,7 +16,6 @@ function c96300057.initial_effect(c) ...@@ -16,7 +16,6 @@ function c96300057.initial_effect(c)
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c96300057.uncon)
e2:SetTarget(c96300057.sptg) e2:SetTarget(c96300057.sptg)
e2:SetOperation(c96300057.spop) e2:SetOperation(c96300057.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
...@@ -37,7 +36,6 @@ function c96300057.initial_effect(c) ...@@ -37,7 +36,6 @@ function c96300057.initial_effect(c)
e5:SetType(EFFECT_TYPE_EQUIP) e5:SetType(EFFECT_TYPE_EQUIP)
e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e5:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e5:SetCode(EFFECT_DESTROY_SUBSTITUTE) e5:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e5:SetCondition(c96300057.uncon)
e5:SetValue(c96300057.repval) e5:SetValue(c96300057.repval)
c:RegisterEffect(e5) c:RegisterEffect(e5)
--eqlimit --eqlimit
...@@ -48,9 +46,6 @@ function c96300057.initial_effect(c) ...@@ -48,9 +46,6 @@ function c96300057.initial_effect(c)
e6:SetValue(c96300057.eqlimit) e6:SetValue(c96300057.eqlimit)
c:RegisterEffect(e6) c:RegisterEffect(e6)
end end
function c96300057.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c96300057.repval(e,re,r,rp) function c96300057.repval(e,re,r,rp)
return bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0 return bit.band(r,REASON_BATTLE+REASON_EFFECT)~=0
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