Commit be979c10 authored by salix5's avatar salix5

fix

parent 3a487433
...@@ -70,9 +70,8 @@ function c11317977.thcon2(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,9 +70,8 @@ function c11317977.thcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsLocation(LOCATION_GRAVE) and r==REASON_FUSION return e:GetHandler():IsLocation(LOCATION_GRAVE) and r==REASON_FUSION
end end
function c11317977.thfilter2(c) function c11317977.thfilter2(c)
return c:IsSetCard(0xdf) and not c:IsCode(11317977) and c:IsAbleToHand() return c:IsSetCard(0xdf) and c:IsType(TYPE_MONSTER) and not c:IsCode(11317977) and c:IsAbleToHand()
and ((c:IsFaceup() and c:IsLocation(LOCATION_EXTRA) and c:IsType(TYPE_MONSTER) and c:IsType(TYPE_PENDULUM)) and ((c:IsFaceup() and c:IsLocation(LOCATION_EXTRA) and c:IsType(TYPE_PENDULUM)) or c:IsLocation(LOCATION_GRAVE))
or (c:IsLocation(LOCATION_EXTRA) and c:IsType(TYPE_MONSTER)))
end end
function c11317977.thtg2(e,tp,eg,ep,ev,re,r,rp,chk) function c11317977.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c11317977.thfilter2,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c11317977.thfilter2,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,nil) end
......
...@@ -77,15 +77,23 @@ function c19254117.tgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -77,15 +77,23 @@ function c19254117.tgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function c19254117.tgop(e,tp,eg,ep,ev,re,r,rp) function c19254117.tgop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
local c=e:GetHandler()
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
if Duel.GetAttacker() then Duel.ChangeAttackTarget(tc) end local a=Duel.GetAttacker()
local e1=Effect.CreateEffect(e:GetHandler()) if a and Duel.GetAttackTarget()~=tc then
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CANNOT_ATTACK)
e1:SetReset(RESET_CHAIN)
a:RegisterEffect(e1)
end
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
e1:SetTargetRange(0,LOCATION_MZONE) e1:SetTargetRange(0,LOCATION_MZONE)
e1:SetReset(RESET_PHASE+PHASE_BATTLE) e1:SetReset(RESET_PHASE+PHASE_BATTLE)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
local e2=Effect.CreateEffect(e:GetHandler()) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET) e2:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE) e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
......
...@@ -46,8 +46,7 @@ end ...@@ -46,8 +46,7 @@ end
function c23160024.drop(e,tp,eg,ep,ev,re,r,rp) function c23160024.drop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,e:GetHandler():GetCode()) Duel.Hint(HINT_CARD,0,e:GetHandler():GetCode())
e:GetHandler():RegisterFlagEffect(23160024,RESET_PHASE+PHASE_END,0,1) e:GetHandler():RegisterFlagEffect(23160024,RESET_PHASE+PHASE_END,0,1)
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) Duel.Draw(tp,1,REASON_EFFECT)
Duel.Draw(p,d,REASON_EFFECT)
end end
function c23160024.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function c23160024.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() end if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() end
......
...@@ -49,14 +49,12 @@ function c84812868.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -49,14 +49,12 @@ function c84812868.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chk==0 then return Duel.IsExistingMatchingCard(c84812868.filter,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) if chk==0 then return Duel.IsExistingMatchingCard(c84812868.filter,tp,LOCATION_ONFIELD,0,1,e:GetHandler())
and Duel.IsExistingTarget(c84812868.filter2,tp,0,LOCATION_SZONE,1,nil) end and Duel.IsExistingTarget(c84812868.filter2,tp,0,LOCATION_SZONE,1,nil) end
local ct=Duel.GetMatchingGroupCount(c84812868.filter,tp,LOCATION_ONFIELD,0,e:GetHandler()) local ct=Duel.GetMatchingGroupCount(c84812868.filter,tp,LOCATION_ONFIELD,0,e:GetHandler())
if Duel.IsPlayerAffectedByEffect(tp,59822133) then ct=1 end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
local g=Duel.SelectTarget(tp,c84812868.filter2,tp,0,LOCATION_SZONE,1,ct,nil) local g=Duel.SelectTarget(tp,c84812868.filter2,tp,0,LOCATION_SZONE,1,ct,nil)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0) Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0)
end end
function c84812868.thop(e,tp,eg,ep,ev,re,r,rp) function c84812868.thop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e) local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e)
if g:GetCount()>1 and Duel.IsPlayerAffectedByEffect(tp,59822133) then return end
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
end end
......
...@@ -148,7 +148,7 @@ STATUS_SUMMON_DISABLED =0x20000 --召唤无效後尚未移動 ...@@ -148,7 +148,7 @@ STATUS_SUMMON_DISABLED =0x20000 --召唤无效後尚未移動
STATUS_ACTIVATE_DISABLED =0x40000 --发动无效後尚未移動 STATUS_ACTIVATE_DISABLED =0x40000 --发动无效後尚未移動
STATUS_EFFECT_REPLACED =0x80000 --效果被替代(红莲霸权) STATUS_EFFECT_REPLACED =0x80000 --效果被替代(红莲霸权)
STATUS_UNION =0x100000 --同盟 STATUS_UNION =0x100000 --同盟
STATUS_ATTACK_CANCELED =0x200000 --攻击取消(卷回?) STATUS_ATTACK_CANCELED =0x200000 --攻击取消
STATUS_INITIALIZING =0x400000 --初始化.. STATUS_INITIALIZING =0x400000 --初始化..
STATUS_ACTIVATED =0x800000 --效果已发动 STATUS_ACTIVATED =0x800000 --效果已发动
STATUS_JUST_POS =0x1000000 --已改變表示形式(用於STATUS_CONTINUOUS_POS判定) STATUS_JUST_POS =0x1000000 --已改變表示形式(用於STATUS_CONTINUOUS_POS判定)
...@@ -418,7 +418,7 @@ EFFECT_ATTACK_ALL =193 --可以攻击所有怪兽 ...@@ -418,7 +418,7 @@ EFFECT_ATTACK_ALL =193 --可以攻击所有怪兽
EFFECT_EXTRA_ATTACK =194 --增加攻击次数 EFFECT_EXTRA_ATTACK =194 --增加攻击次数
EFFECT_MUST_BE_ATTACKED =195 --必须攻击(那只怪兽) EFFECT_MUST_BE_ATTACKED =195 --必须攻击(那只怪兽)
EFFECT_AUTO_BE_ATTACKED =196 --只能攻击(那只怪兽) EFFECT_AUTO_BE_ATTACKED =196 --只能攻击(那只怪兽)
EFFECT_ATTACK_DISABLED =197 --攻击已被無效(processor.cpp) EFFECT_ATTACK_DISABLED =197 --攻击無效(Duel.NegateAttack())
EFFECT_NO_BATTLE_DAMAGE =200 --不会给对方造成战斗伤害 EFFECT_NO_BATTLE_DAMAGE =200 --不会给对方造成战斗伤害
EFFECT_AVOID_BATTLE_DAMAGE =201 --不会对自己造成战斗伤害 EFFECT_AVOID_BATTLE_DAMAGE =201 --不会对自己造成战斗伤害
EFFECT_REFLECT_BATTLE_DAMAGE =202 --反弹战斗伤害 EFFECT_REFLECT_BATTLE_DAMAGE =202 --反弹战斗伤害
......
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