Commit fb3e03ce authored by mercury233's avatar mercury233

fix

parent eeb10506
...@@ -40,7 +40,6 @@ function c100200188.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,7 +40,6 @@ function c100200188.spop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DISABLE) e1:SetCode(EFFECT_DISABLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
local e2=e1:Clone() local e2=e1:Clone()
......
...@@ -45,9 +45,8 @@ function c100271246.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -45,9 +45,8 @@ function c100271246.cost(e,tp,eg,ep,ev,re,r,rp,chk)
--cannot attack --cannot attack
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_OATH)
e1:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE) e1:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE)
e1:SetProperty(EFFECT_FLAG_OATH)
e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTargetRange(LOCATION_MZONE,0)
e1:SetCondition(c100271246.atkcon) e1:SetCondition(c100271246.atkcon)
e1:SetTarget(c100271246.atktg) e1:SetTarget(c100271246.atktg)
...@@ -67,7 +66,7 @@ function c100271246.spfilter(c,e,tp) ...@@ -67,7 +66,7 @@ function c100271246.spfilter(c,e,tp)
return c:IsType(TYPE_NORMAL) and c:IsLevelAbove(7) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsType(TYPE_NORMAL) and c:IsLevelAbove(7) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c100271246.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c100271246.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and c100271246.filter(chkc) end
if chk==0 then return Duel.IsExistingTarget(c100271246.filter,tp,0,LOCATION_MZONE,1,nil) if chk==0 then return Duel.IsExistingTarget(c100271246.filter,tp,0,LOCATION_MZONE,1,nil)
and Duel.IsExistingMatchingCard(c100271246.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(c100271246.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,e,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
......
...@@ -64,7 +64,6 @@ function c100271247.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -64,7 +64,6 @@ function c100271247.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
end end
function c100271247.rmop(e,tp,eg,ep,ev,re,r,rp) function c100271247.rmop(e,tp,eg,ep,ev,re,r,rp)
if not e:GetHandler():IsRelateToEffect(e) then return end
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
Duel.Remove(tc,POS_FACEUP,REASON_EFFECT) Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
...@@ -78,11 +77,12 @@ function c100271247.thfilter(c) ...@@ -78,11 +77,12 @@ function c100271247.thfilter(c)
return c:IsType(TYPE_NORMAL) and c:IsLevelAbove(7) and (c:IsAbleToHand() or c:IsAbleToDeck()) return c:IsType(TYPE_NORMAL) and c:IsLevelAbove(7) and (c:IsAbleToHand() or c:IsAbleToDeck())
end end
function c100271247.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c100271247.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c100271247.thfilter(c) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c100271247.thfilter(chkc) end
if chk==0 then return Duel.IsExistingTarget(c100271247.thfilter,tp,LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingTarget(c100271247.thfilter,tp,LOCATION_GRAVE,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
local g=Duel.SelectTarget(tp,c100271247.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectTarget(tp,c100271247.thfilter,tp,LOCATION_GRAVE,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_TOHAND+CATEGORY_TODECK,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
Duel.SetOperationInfo(0,CATEGORY_TODECK,g,1,0,0)
end end
function c100271247.thop(e,tp,eg,ep,ev,re,r,rp) function c100271247.thop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
......
...@@ -57,7 +57,7 @@ end ...@@ -57,7 +57,7 @@ end
function c100311001.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c100311001.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and aux.disfilter1(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and aux.disfilter1(chkc) end
if chk==0 then return Duel.IsExistingTarget(aux.disfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end if chk==0 then return Duel.IsExistingTarget(aux.disfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
Duel.SelectTarget(tp,aux.disfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) Duel.SelectTarget(tp,aux.disfilter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
end end
function c100311001.eqfilter(c) function c100311001.eqfilter(c)
......
...@@ -7,6 +7,7 @@ function c100311025.initial_effect(c) ...@@ -7,6 +7,7 @@ function c100311025.initial_effect(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(0,TIMING_END_PHASE)
e1:SetCountLimit(1,100311025+EFFECT_COUNT_CODE_OATH) e1:SetCountLimit(1,100311025+EFFECT_COUNT_CODE_OATH)
e1:SetCondition(c100311025.condition) e1:SetCondition(c100311025.condition)
e1:SetTarget(c100311025.target) e1:SetTarget(c100311025.target)
......
...@@ -17,8 +17,8 @@ function c100311034.filter(c) ...@@ -17,8 +17,8 @@ function c100311034.filter(c)
return c:IsFaceup() and c:IsSetCard(0x29) and c:IsType(TYPE_SYNCHRO) return c:IsFaceup() and c:IsSetCard(0x29) and c:IsType(TYPE_SYNCHRO)
end end
function c100311034.condition(e,tp,eg,ep,ev,re,r,rp) function c100311034.condition(e,tp,eg,ep,ev,re,r,rp)
if ep==tp or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return end return ep==1-tp and re:IsHasType(EFFECT_TYPE_ACTIVATE) and Duel.IsChainNegatable(ev)
return Duel.IsChainNegatable(ev) and Duel.IsExistingMatchingCard(c100311034.filter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(c100311034.filter,tp,LOCATION_MZONE,0,1,nil)
end end
function c100311034.target(e,tp,eg,ep,ev,re,r,rp,chk) function c100311034.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return aux.nbcon(tp,re) end if chk==0 then return aux.nbcon(tp,re) end
...@@ -34,9 +34,11 @@ function c100311034.cfilter(c) ...@@ -34,9 +34,11 @@ function c100311034.cfilter(c)
return c100311034.atkfilter(c) and c:IsLevel(10) return c100311034.atkfilter(c) and c:IsLevel(10)
end end
function c100311034.activate(e,tp,eg,ep,ev,re,r,rp) function c100311034.activate(e,tp,eg,ep,ev,re,r,rp)
if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) and Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)~=0 and eg:GetFirst():IsLocation(LOCATION_REMOVED) then if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re)
and Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)~=0 and eg:GetFirst():IsLocation(LOCATION_REMOVED) then
local ct=Duel.GetMatchingGroupCount(Card.IsFaceup,tp,LOCATION_REMOVED,LOCATION_REMOVED,nil) local ct=Duel.GetMatchingGroupCount(Card.IsFaceup,tp,LOCATION_REMOVED,LOCATION_REMOVED,nil)
if Duel.IsExistingMatchingCard(c100311034.cfilter,tp,LOCATION_MZONE,0,1,nil) and ct>0 and Duel.SelectYesNo(tp,aux.Stringid(100311034,0)) then if Duel.IsExistingMatchingCard(c100311034.cfilter,tp,LOCATION_MZONE,0,1,nil) and ct>0
and Duel.SelectYesNo(tp,aux.Stringid(100311034,0)) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
local g=Duel.SelectMatchingCard(tp,c100311034.atkfilter,tp,LOCATION_MZONE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c100311034.atkfilter,tp,LOCATION_MZONE,0,1,1,nil)
...@@ -45,7 +47,6 @@ function c100311034.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -45,7 +47,6 @@ function c100311034.activate(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
e1:SetValue(ct*100) e1:SetValue(ct*100)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
......
...@@ -36,6 +36,6 @@ function c100415021.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -36,6 +36,6 @@ function c100415021.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local tc=g:Select(tp,1,1,nil):GetFirst() local tc=g:Select(tp,1,1,nil):GetFirst()
Duel.LinkSummon(tp,sg:GetFirst(),nil) Duel.LinkSummon(tp,tc,nil)
end end
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