Commit d9962bc5 authored by Huangnan's avatar Huangnan

fix

parent 5eca7fc0
No preview for this file type
...@@ -112,7 +112,7 @@ cm.card_code_list={96071000}--记述卡名编号 ...@@ -112,7 +112,7 @@ cm.card_code_list={96071000}--记述卡名编号
cm.assault_name=96071054--卡名记述编号 cm.assault_name=96071054--卡名记述编号
--pzone specialsummon --pzone specialsummon
function cm.cfilter(c,tp) function cm.cfilter(c,tp)
return c:IsSummonPlayer(tp) and c:IsSummonType(SUMMON_TYPE_ADVANCE) and c:IsSetCard(0xef1) return c:IsSummonType(SUMMON_TYPE_ADVANCE) and c:GetSummonPlayer()==tp and c:IsSetCard(0xef1)
end end
function cm.spcon(e,tp,eg,ep,ev,re,r,rp) function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(cm.cfilter,1,nil,tp) return eg:IsExists(cm.cfilter,1,nil,tp)
...@@ -138,11 +138,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -138,11 +138,10 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
end end
--pendulum set --pendulum set
function cm.pfilter(c,se) function cm.pfilter(c,se)
return c:IsFaceup() and (se==nil or c:GetReasonEffect()~=se) return c:IsControler(tp) and c:IsSetCard(0xef1)
end end
function cm.pencon(e,tp,eg,ep,ev,re,r,rp) function cm.pencon(e,tp,eg,ep,ev,re,r,rp)
local se=e:GetLabelObject():GetLabelObject() return eg:IsExists(cm.pfilter,2,nil,tp)
return eg:IsExists(cm.pfilter,2,nil,se)
end end
function cm.pentg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1) end if chk==0 then return Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1) end
......
...@@ -148,7 +148,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -148,7 +148,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp,tc:GetCode()) local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp,tc:GetCode())
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENSE) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Remove(c,POS_FACEUP,REASON_EFFECT) Duel.Remove(c,POS_FACEUP,REASON_EFFECT)
......
...@@ -126,7 +126,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -126,7 +126,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp,tc:GetCode()) local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp,tc:GetCode())
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENSE) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Remove(c,POS_FACEUP,REASON_EFFECT) Duel.Remove(c,POS_FACEUP,REASON_EFFECT)
......
...@@ -57,7 +57,7 @@ function cm.cfilter(c,tp) ...@@ -57,7 +57,7 @@ function cm.cfilter(c,tp)
return c:IsFaceup() and c:IsSetCard(0xef1) and c:IsLevelAbove(0) and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil,c) return c:IsFaceup() and c:IsSetCard(0xef1) and c:IsLevelAbove(0) and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil,c)
end end
function cm.thfilter(c,rc) function cm.thfilter(c,rc)
return c:GetLevel()~=rc:GetLevel() and c:IsType(TYPE_MONSTER) and c:IsSetCard(0xef1) and c:IsAbleToHand() return c:GetLevel()~=rc:GetLevel() and c:IsType(TYPE_MONSTER) and c:IsSetCard(0x6ef1) and c:IsAbleToHand()
end end
function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and cm.cfilter(chkc,e,tp) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and cm.cfilter(chkc,e,tp) 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