Commit e5c27677 authored by POLYMER's avatar POLYMER

fix

parent 762e05af
...@@ -3,7 +3,7 @@ function c10111120.initial_effect(c) ...@@ -3,7 +3,7 @@ function c10111120.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(10111120,0)) e1:SetDescription(aux.Stringid(10111120,0))
e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SEARCH+CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_QUICK_O) e1:SetType(EFFECT_TYPE_QUICK_O)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
......
...@@ -11,7 +11,7 @@ function c10111122.initial_effect(c) ...@@ -11,7 +11,7 @@ function c10111122.initial_effect(c)
local e7=Effect.CreateEffect(c) local e7=Effect.CreateEffect(c)
e7:SetDescription(aux.Stringid(10111122,2)) e7:SetDescription(aux.Stringid(10111122,2))
e7:SetCategory(CATEGORY_DRAw) e7:SetCategory(CATEGORY_DRAw)
e7:SetType(EFFECT_TYPE_QUICK_O) e7:SetType(EFFECT_TYPE_QUICK_O+EFFECT_TYPE_TRIGGER_F)
e7:SetCode(EVENT_BATTLE_START) e7:SetCode(EVENT_BATTLE_START)
e7:SetRange(LOCATION_MZONE) e7:SetRange(LOCATION_MZONE)
e7:SetCountLimit(1) e7:SetCountLimit(1)
......
...@@ -170,10 +170,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -170,10 +170,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
if not tc:IsType(TYPE_EQUIP+TYPE_CONTINUOUS+TYPE_FIELD) and not tc:IsHasEffect(EFFECT_REMAIN_FIELD) then tc:CancelToGrave(false) end if not tc:IsType(TYPE_EQUIP+TYPE_CONTINUOUS+TYPE_FIELD) and not tc:IsHasEffect(EFFECT_REMAIN_FIELD) then tc:CancelToGrave(false) end
tc:CreateEffectRelation(te) tc:CreateEffectRelation(te)
if cost then cost(te,tp,ceg,cep,cev,cre,cr,crp,1) end if cost then cost(te,tp,ceg,cep,cev,cre,cr,crp,1) end
local _GetTurnPlayer=Duel.GetTurnPlayer
Duel.GetTurnPlayer=function() return 1-tp end
if target then target(te,tp,ceg,cep,cev,cre,cr,crp,1) end if target then target(te,tp,ceg,cep,cev,cre,cr,crp,1) end
Duel.GetTurnPlayer=_GetTurnPlayer
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS) local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
if g then if g then
for fc in aux.Next(g) do for fc in aux.Next(g) do
...@@ -224,7 +221,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -224,7 +221,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.ClearTargetCard() Duel.ClearTargetCard()
tc:CreateEffectRelation(te) tc:CreateEffectRelation(te)
if cost then cost(te,tp,eg,ep,ev,re,r,rp,1) end if cost then cost(te,tp,eg,ep,ev,re,r,rp,1) end
if target then target(te,tp,eg,ep,ev,re,r,rp,1,false,true) end local _GetTurnPlayer=Duel.GetTurnPlayer
Duel.GetTurnPlayer=function() return 1-tp end
if target then target(te,tp,eg,ep,ev,re,r,rp,1) end
Duel.GetTurnPlayer=_GetTurnPlayer
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS) local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
if g then if g then
for fc in aux.Next(g) do for fc in aux.Next(g) do
...@@ -262,7 +262,8 @@ end ...@@ -262,7 +262,8 @@ end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local g=c:GetMaterial() local g=c:GetMaterial()
if c:IsRelateToEffect(e) and Duel.SendtoHand(c,nil,REASON_EFFECT)>0 and c:IsLocation(LOCATION_HAND) and g and #g>0 then local sumtype=c:GetSummonType()
if c:IsRelateToEffect(e) and Duel.SendtoHand(c,nil,REASON_EFFECT)>0 and c:IsLocation(LOCATION_HAND) and sumtype&SUMMON_TYPE_ADVANCE>0 and g and #g>0 then
local tc=g:GetFirst() local tc=g:GetFirst()
if tc:IsFaceup() and tc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED+LOCATION_EXTRA) and tc:IsReason(REASON_SUMMON) and tc:GetReasonCard()==c and tc:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SpecialSummon(tc,SUMMON_TYPE_RITUAL,tp,tp,false,true,POS_FACEUP)>0 then tc:CompleteProcedure() end if tc:IsFaceup() and tc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED+LOCATION_EXTRA) and tc:IsReason(REASON_SUMMON) and tc:GetReasonCard()==c and tc:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SpecialSummon(tc,SUMMON_TYPE_RITUAL,tp,tp,false,true,POS_FACEUP)>0 then tc:CompleteProcedure() end
end end
......
...@@ -35,10 +35,16 @@ function c49811330.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -35,10 +35,16 @@ function c49811330.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local hc=gs:Filter(Card.IsLocation,nil,LOCATION_HAND) local hc=gs:Filter(Card.IsLocation,nil,LOCATION_HAND)
local tc=gs:GetFirst() local tc=gs:GetFirst()
local code1=tc:GetCode() local code1=tc:GetCode()
Duel.Hint(HINT_CARD,1,code1)
Duel.Hint(HINT_CODE,1,code1)
tc=gs:GetNext() tc=gs:GetNext()
local code2=tc:GetCode() local code2=tc:GetCode()
Duel.Hint(HINT_CARD,1,code2)
Duel.Hint(HINT_CODE,1,code2)
tc=gs:GetNext() tc=gs:GetNext()
local code3=tc:GetCode() local code3=tc:GetCode()
Duel.Hint(HINT_CARD,1,code3)
Duel.Hint(HINT_CODE,1,code3)
tc=gs:GetNext() tc=gs:GetNext()
if #dc>0 then if #dc>0 then
Duel.ShuffleDeck(tp) Duel.ShuffleDeck(tp)
...@@ -154,7 +160,7 @@ end ...@@ -154,7 +160,7 @@ end
--end --end
function c49811330.adlimit(e,c) function c49811330.adlimit(e,c)
local code1,code2,code3=e:GetLabel() local code1,code2,code3=e:GetLabel()
return aux.TargetBoolFunction(Card.IsCode,code1,code2,code3) return c:IsCode(code1,code2,code3)
end end
function c49811330.sslimit(e,c) function c49811330.sslimit(e,c)
local code1,code2,code3=e:GetLabel() local code1,code2,code3=e:GetLabel()
......
...@@ -81,7 +81,7 @@ function c50213215.thcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -81,7 +81,7 @@ function c50213215.thcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
end end
function c50213215.thfilter(c) function c50213215.thfilter(c)
return c:IsSetCard(0xcbf) and not c:IsCode(50213215) and c:IsType(TYPE_EQUIP+TYPE_SPELL) and c:IsAbleToHand() return c:IsSetCard(0xcbf) and not c:IsCode(50213215) and c:IsType(TYPE_EQUIP) and c:IsAbleToHand()
end end
function c50213215.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c50213215.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c50213215.thfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c50213215.thfilter,tp,LOCATION_DECK,0,1,nil) end
......
...@@ -71,7 +71,7 @@ function c50213220.thcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,7 +71,7 @@ function c50213220.thcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
end end
function c50213220.thfilter(c) function c50213220.thfilter(c)
return c:IsSetCard(0xcbf) and not c:IsCode(50213220) and c:IsType(TYPE_EQUIP+TYPE_SPELL) and c:IsAbleToHand() return c:IsSetCard(0xcbf) and not c:IsCode(50213220) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
end end
function c50213220.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c50213220.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c50213220.thfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c50213220.thfilter,tp,LOCATION_DECK,0,1,nil) end
......
...@@ -97,7 +97,8 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -97,7 +97,8 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CHANGE_LINK_MARKER_KOISHI) e1:SetCode(EFFECT_CHANGE_LINK_MARKER_KOISHI)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_SINGLE_RANGE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetValue(Lkm) e1:SetValue(Lkm)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
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