Commit 3c8b8973 authored by Nemo Ma's avatar Nemo Ma

fix

parent 2995113d
...@@ -12,11 +12,7 @@ ...@@ -12,11 +12,7 @@
130002004 0 130002004 0
130002005 0 130002005 0
#WILD, I say WILD, WAHAHA #WILD, I say WILD, WAHAHA
82206085 0 4058 0
82206084 0
82206075 0
14000703 0
14000704 0
575513 0 575513 0
700021 0 700021 0
700022 0 700022 0
...@@ -42,6 +38,7 @@ ...@@ -42,6 +38,7 @@
4865039 0 4865039 0
4865040 0 4865040 0
9981625 0 9981625 0
10080420 0
10736541 0 10736541 0
11163044 0 11163044 0
11450000 0 11450000 0
...@@ -52,17 +49,32 @@ ...@@ -52,17 +49,32 @@
11451014 0 11451014 0
11451015 0 11451015 0
11451016 0 11451016 0
11451767 0
11479943 0
11662004 0
12249903 0
12344023 0
12581198 0
12603457 0
12678871 0 12678871 0
13131365 0
14000703 0
14000704 0
14012021 0 14012021 0
14824018 0 14824018 0
14824033 0 14824033 0
14943078 0
15000122 0 15000122 0
15000316 0 15000316 0
15000317 0 15000317 0
15000318 0 15000318 0
15004002 0 15004002 0
15004003 0 15004003 0
15131668 0
15203827 0
15291627 0 15291627 0
15898473 0
16055152 0
16170003 0 16170003 0
16200000 0 16200000 0
16200001 0 16200001 0
...@@ -73,8 +85,12 @@ ...@@ -73,8 +85,12 @@
16200007 0 16200007 0
16200008 0 16200008 0
18678558 0 18678558 0
18830139 0
18942397 0
19605513 0
20220679 0 20220679 0
22348028 0 22348028 0
22348134 0
25000000 0 25000000 0
25000001 0 25000001 0
25000049 0 25000049 0
...@@ -719,6 +735,13 @@ ...@@ -719,6 +735,13 @@
86510004 0 86510004 0
86510079 0 86510079 0
86868953 0 86868953 0
89390000 0
89390001 0
89390002 0
89390003 0
89390004 0
89390005 0
89390006 0
90351999 0 90351999 0
90700001 0 90700001 0
90700002 0 90700002 0
...@@ -854,6 +877,31 @@ ...@@ -854,6 +877,31 @@
96071074 0 96071074 0
96071075 0 96071075 0
98452220 0 98452220 0
98730001 0
98730004 0
98730007 0
98730010 0
98730013 0
98730015 0
98730017 0
98730019 0
98730113 0
98730115 0
98730117 0
98730119 0
98730213 0
98730215 0
98730217 0
98730219 0
98730313 0
98730315 0
98730317 0
98730319 0
98730413 0
98730415 0
98730417 0
98730419 0
98731001 0
99550610 0 99550610 0
99700125 0 99700125 0
99700135 0 99700135 0
...@@ -885,6 +933,69 @@ ...@@ -885,6 +933,69 @@
99700295 0 99700295 0
99700296 0 99700296 0
99700298 0 99700298 0
108740000 0
108740001 0
108740002 0
108740003 0
108740004 0
108740005 0
108740006 0
108740007 0
111443942 0
112538374 0
113482285 0
113652145 0
113705774 0
114064005 0
114303426 0
114427368 0
114431144 0
114439429 0
114562761 0
114606001 0
114644893 0
114707556 0
114722253 0
114890515 0
114967855 0
115072031 0
115284026 0
115399521 0
115449321 0
115848157 0
115850474 0
116227966 0
116301233 0
116472626 0
116511113 0
116839253 0
116968003 0
117066828 0
117179181 0
117485040 0
117681594 0
117837139 0
117960683 0
117981478 0
118038143 0
118353144 0
118426889 0
118776531 0
118817732 0
118824150 0
118875971 0
119150521 0
119638197 0
119828752 0
120366274 0
121074344 0
121082832 0
121082833 0
121593977 0
122842126 0
123064604 0
127541563 0
129223325 0
130001000 0 130001000 0
130005101 0 130005101 0
130005102 0 130005102 0
...@@ -918,6 +1029,8 @@ ...@@ -918,6 +1029,8 @@
130006022 0 130006022 0
130006023 0 130006023 0
130006024 0 130006024 0
151194046 0
192746535 0
#Semi-Wild 1003 #Semi-Wild 1003
31409200 0 31409200 0
31409201 0 31409201 0
......
...@@ -37,6 +37,7 @@ function c29065508.xyzop(e,tp,chk) ...@@ -37,6 +37,7 @@ function c29065508.xyzop(e,tp,chk)
if Duel.GetFlagEffect(tp,29096814)==1 then if Duel.GetFlagEffect(tp,29096814)==1 then
Duel.ResetFlagEffect(tp,29096814) Duel.ResetFlagEffect(tp,29096814)
Duel.RemoveCounter(tp,1,0,0x10ae,1,REASON_RULE) Duel.RemoveCounter(tp,1,0,0x10ae,1,REASON_RULE)
Duel.RegisterFlagEffect(tp,29065508,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
else else
Duel.RemoveCounter(tp,1,0,0x10ae,2,REASON_RULE) Duel.RemoveCounter(tp,1,0,0x10ae,2,REASON_RULE)
Duel.RegisterFlagEffect(tp,29065508,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1) Duel.RegisterFlagEffect(tp,29065508,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
......
...@@ -28,9 +28,15 @@ function c29065509.ovfilter(c) ...@@ -28,9 +28,15 @@ function c29065509.ovfilter(c)
return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and _G["c"..c:GetCode()].named_with_Arknight)) return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and _G["c"..c:GetCode()].named_with_Arknight))
end end
function c29065509.xyzop(e,tp,chk) function c29065509.xyzop(e,tp,chk)
if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,0x10ae,2,REASON_COST) and Duel.GetFlagEffect(tp,29065509)==0 end if chk==0 then return (Duel.IsCanRemoveCounter(tp,1,0,0x10ae,2,REASON_COST) or (Duel.GetFlagEffect(tp,29096814)==1 and Duel.IsCanRemoveCounter(tp,1,0,0x10ae,1,REASON_COST))) and Duel.GetFlagEffect(tp,29065509)==0 end
if Duel.GetFlagEffect(tp,29096814)==1 then
Duel.ResetFlagEffect(tp,29096814)
Duel.RemoveCounter(tp,1,0,0x10ae,1,REASON_RULE)
Duel.RegisterFlagEffect(tp,29065509,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
else
Duel.RemoveCounter(tp,1,0,0x10ae,2,REASON_RULE) Duel.RemoveCounter(tp,1,0,0x10ae,2,REASON_RULE)
Duel.RegisterFlagEffect(tp,29065509,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1) Duel.RegisterFlagEffect(tp,29065509,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end
end end
function c29065509.discon(e,tp,eg,ep,ev,re,r,rp) function c29065509.discon(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
......
...@@ -29,16 +29,20 @@ function c29065536.initial_effect(c) ...@@ -29,16 +29,20 @@ function c29065536.initial_effect(c)
c29065536.summon_effect=e2 c29065536.summon_effect=e2
end end
function c29065536.cfilter(c) function c29065536.cfilter(c)
return c:IsCode(29065521,29065523,29065536,15000129,29065537,29065549) and c:IsType(TYPE_MONSTER) return c:IsCode(29065521,29065523,29065536,15000129,29065537,29065549,29096814,29080482,29039748) and c:IsType(TYPE_MONSTER)
end end
function c29065536.hspcon(e,c) function c29065536.hspcon(e,c)
if c==nil then return true end if c==nil then return true end
local tp=c:GetControler() local tp=c:GetControler()
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
return ft>0 and Duel.IsCanRemoveCounter(tp,1,0,0x10ae,1,REASON_COST) return ft>0 and (Duel.IsCanRemoveCounter(tp,1,0,0x10ae,1,REASON_COST) or Duel.GetFlagEffect(tp,29096814)==1)
end end
function c29065536.hspop(e,tp,eg,ep,ev,re,r,rp,c) function c29065536.hspop(e,tp,eg,ep,ev,re,r,rp,c)
if Duel.GetFlagEffect(tp,29096814)==1 then
Duel.ResetFlagEffect(tp,29096814)
else
Duel.RemoveCounter(tp,1,0,0x10ae,1,REASON_EFFECT) Duel.RemoveCounter(tp,1,0,0x10ae,1,REASON_EFFECT)
end
end end
function c29065536.ctg(e,tp,eg,ep,ev,re,r,rp,chk) function c29065536.ctg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c29065536.cfilter,tp,LOCATION_MZONE,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c29065536.cfilter,tp,LOCATION_MZONE,0,1,nil) end
......
...@@ -17,9 +17,15 @@ function c29065542.ovfilter(c) ...@@ -17,9 +17,15 @@ function c29065542.ovfilter(c)
return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and _G["c"..c:GetCode()].named_with_Arknight)) return c:IsFaceup() and (c:IsSetCard(0x87af) or (_G["c"..c:GetCode()] and _G["c"..c:GetCode()].named_with_Arknight))
end end
function c29065542.xyzop(e,tp,chk) function c29065542.xyzop(e,tp,chk)
if chk==0 then return Duel.GetFlagEffect(tp,29065542)==0 and Duel.IsCanRemoveCounter(tp,1,0,0x10ae,2,REASON_COST) end if chk==0 then return (Duel.IsCanRemoveCounter(tp,1,0,0x10ae,2,REASON_COST) or (Duel.GetFlagEffect(tp,29096814)==1 and Duel.IsCanRemoveCounter(tp,1,0,0x10ae,1,REASON_COST))) and Duel.GetFlagEffect(tp,29065542)==0 end
Duel.RemoveCounter(tp,1,0,0x10ae,2,REASON_COST) if Duel.GetFlagEffect(tp,29096814)==1 then
Duel.ResetFlagEffect(tp,29096814)
Duel.RemoveCounter(tp,1,0,0x10ae,1,REASON_RULE)
Duel.RegisterFlagEffect(tp,29065542,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1) Duel.RegisterFlagEffect(tp,29065542,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
else
Duel.RemoveCounter(tp,1,0,0x10ae,2,REASON_RULE)
Duel.RegisterFlagEffect(tp,29065542,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end
end end
function c29065542.cxyzcon(e,tp,eg,ep,ev,re,r,rp) function c29065542.cxyzcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ) return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
......
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