Commit 154889b2 authored by Nemo Ma's avatar Nemo Ma

fix 1110

parent 065e40c4
This diff is collapsed.
No preview for this file type
...@@ -101,7 +101,7 @@ function c40008874.setop(e,tp,eg,ep,ev,re,r,rp) ...@@ -101,7 +101,7 @@ function c40008874.setop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c40008874.pencon(e,tp,eg,ep,ev,re,r,rp) function c40008874.pencon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsReason(REASON_COST) and re:IsHasType(0x7e0) return e:GetHandler():IsReason(REASON_COST) and re:IsHasType(0xdf1d)
and not re:GetHandler():IsCode(40008874) and not re:GetHandler():IsCode(40008874)
end end
function c40008874.pentg(e,tp,eg,ep,ev,re,r,rp,chk) function c40008874.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -46,7 +46,7 @@ function c9950194.sumsuc(e,tp,eg,ep,ev,re,r,rp) ...@@ -46,7 +46,7 @@ function c9950194.sumsuc(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_MUSIC,0,aux.Stringid(9950194,0)) Duel.Hint(HINT_MUSIC,0,aux.Stringid(9950194,0))
end end
function c9950194.filter(c) function c9950194.filter(c)
return c:IsFaceup() and c:IsRace(RACE_DRAGON) return c:IsFaceup() and c:IsSetCard(0xba5)
end end
function c9950194.effop(e,tp,eg,ep,ev,re,r,rp) function c9950194.effop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -26,7 +26,7 @@ function c9950203.sumsuc(e,tp,eg,ep,ev,re,r,rp) ...@@ -26,7 +26,7 @@ function c9950203.sumsuc(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_MUSIC,0,aux.Stringid(9950203,4)) Duel.Hint(HINT_MUSIC,0,aux.Stringid(9950203,4))
end end
function c9950203.filter(c) function c9950203.filter(c)
return c:IsSetCard(0xcba5) and c:IsSummonable(true,nil) or c:IsMSetable(true,nil) return c:IsSetCard(0xcba5) and c:IsType(TYPE_MONSTER) and c:GetCode()~=9950167 and c:IsSummonable(true,nil) or c:IsMSetable(true,nil)
end end
function c9950203.condition2(e,tp,eg,ep,ev,re,r,rp) function c9950203.condition2(e,tp,eg,ep,ev,re,r,rp)
local tn=Duel.GetTurnPlayer() local tn=Duel.GetTurnPlayer()
......
...@@ -69,7 +69,7 @@ function c9950255.spcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -69,7 +69,7 @@ function c9950255.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Remove(g1,POS_FACEUP,REASON_COST) Duel.Remove(g1,POS_FACEUP,REASON_COST)
end end
function c9950255.spfilter(c,e,tp) function c9950255.spfilter(c,e,tp)
return c:IsSetCard(0xba5,0xbc8) and c:IsType(TYPE_RITUAL) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) return c:IsSetCard(0xba5,0xbc8) and c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,true,false)
end end
function c9950255.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c9950255.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
...@@ -128,6 +128,9 @@ function c9980207.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -128,6 +128,9 @@ function c9980207.spop(e,tp,eg,ep,ev,re,r,rp)
tc:CompleteProcedure() tc:CompleteProcedure()
end end
end end
function c9980207.discon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsSummonType(SUMMON_TYPE_RITUAL)
end
function c9980207.destg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c9980207.destg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) end if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) end
if chk==0 then return Duel.IsExistingTarget(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil) end if chk==0 then return Duel.IsExistingTarget(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil) end
......
...@@ -6,8 +6,8 @@ function c9980763.initial_effect(c) ...@@ -6,8 +6,8 @@ function c9980763.initial_effect(c)
e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetCode(EVENT_SUMMON_SUCCESS)
e1:SetTarget(c9980763.thtg) e1:SetTarget(c9980763.thtg2)
e1:SetOperation(c9980763.thop) e1:SetOperation(c9980763.thop2)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--atk --atk
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
...@@ -47,11 +47,11 @@ end ...@@ -47,11 +47,11 @@ end
function c9980763.thfilter2(c) function c9980763.thfilter2(c)
return ((c:IsSetCard(0x9bc1) and c:IsType(TYPE_SPELL+TYPE_TRAP)) or c:IsCode(9980773)) and c:IsAbleToHand() return ((c:IsSetCard(0x9bc1) and c:IsType(TYPE_SPELL+TYPE_TRAP)) or c:IsCode(9980773)) and c:IsAbleToHand()
end end
function c9980763.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c9980763.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c9980763.thfilter2,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c9980763.thfilter2,tp,LOCATION_DECK,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end end
function c9980763.thop(e,tp,eg,ep,ev,re,r,rp) function c9980763.thop2(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c9980763.thfilter2,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c9980763.thfilter2,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
......
...@@ -48,8 +48,8 @@ function c9981206.initial_effect(c) ...@@ -48,8 +48,8 @@ function c9981206.initial_effect(c)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1,99812061) e1:SetCountLimit(1,99812061)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetTarget(c9981206.target) e1:SetTarget(c9981206.target2)
e1:SetOperation(c9981206.operation) e1:SetOperation(c9981206.operation2)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--spsummon bgm --spsummon bgm
local e8=Effect.CreateEffect(c) local e8=Effect.CreateEffect(c)
...@@ -129,14 +129,14 @@ end ...@@ -129,14 +129,14 @@ end
function c9981206.filter(c) function c9981206.filter(c)
return c:IsFaceup() and c:IsSetCard(0x9bcd) and c:IsAbleToRemove() return c:IsFaceup() and c:IsSetCard(0x9bcd) and c:IsAbleToRemove()
end end
function c9981206.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c9981206.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c9981206.filter(chkc) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c9981206.filter(chkc) end
if chk==0 then return Duel.IsExistingTarget(c9981206.filter,tp,LOCATION_MZONE,0,1,nil) end if chk==0 then return Duel.IsExistingTarget(c9981206.filter,tp,LOCATION_MZONE,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectTarget(tp,c9981206.filter,tp,LOCATION_MZONE,0,1,1,nil) local g=Duel.SelectTarget(tp,c9981206.filter,tp,LOCATION_MZONE,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
end end
function c9981206.operation(e,tp,eg,ep,ev,re,r,rp) function c9981206.operation2(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and Duel.Remove(tc,tc:GetPosition(),REASON_EFFECT+REASON_TEMPORARY)~=0 then if tc:IsRelateToEffect(e) and Duel.Remove(tc,tc:GetPosition(),REASON_EFFECT+REASON_TEMPORARY)~=0 then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
......
...@@ -21,7 +21,7 @@ function c9981521.initial_effect(c) ...@@ -21,7 +21,7 @@ function c9981521.initial_effect(c)
e2:SetCode(EFFECT_UPDATE_ATTACK) e2:SetCode(EFFECT_UPDATE_ATTACK)
e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCondition(c9981521.atkcon) e2:SetCondition(c9981521.atkcon2)
e2:SetValue(c9981521.atkval) e2:SetValue(c9981521.atkval)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--multi attack --multi attack
...@@ -88,7 +88,7 @@ function c9981521.ctop(e,tp,eg,ep,ev,re,r,rp) ...@@ -88,7 +88,7 @@ function c9981521.ctop(e,tp,eg,ep,ev,re,r,rp)
c:AddCounter(0x52,ct) c:AddCounter(0x52,ct)
end end
end end
function c9981521.atkcon(e,tp,eg,ep,ev,re,r,rp) function c9981521.atkcon2(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
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