Commit d1574eae authored by Fluorohydride's avatar Fluorohydride

Merge pull request #570 from VanillaSalt/patch71

fix
parents 194bd147 9c4518af
......@@ -7,6 +7,7 @@ function c12503902.initial_effect(c)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(0,TIMING_DAMAGE_STEP)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
e1:SetCondition(c12503902.condition)
e1:SetTarget(c12503902.target)
e1:SetOperation(c12503902.operation)
c:RegisterEffect(e1)
......@@ -26,6 +27,9 @@ end
function c12503902.desop2(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(e:GetHandler(),REASON_EFFECT)
end
function c12503902.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
end
function c12503902.filter(c)
return c:IsFaceup() and c:IsRace(RACE_MACHINE)
end
......
......@@ -16,12 +16,13 @@ function c13293158.initial_effect(c)
e2:SetCode(EVENT_ATTACK_ANNOUNCE)
e2:SetOperation(c13293158.atkop)
c:RegisterEffect(e2)
--destroy
--destroy
local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(13293158,0))
e3:SetCategory(CATEGORY_DESTROY)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e3:SetCode(EVENT_BATTLE_DAMAGE)
e3:SetCondition(c13293158.condition)
e3:SetTarget(c13293158.target)
e3:SetOperation(c13293158.activate)
c:RegisterEffect(e3)
......@@ -42,6 +43,9 @@ end
function c13293158.aclimit(e,re,tp)
return re:IsHasType(EFFECT_TYPE_ACTIVATE)
end
function c13293158.condition(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function c13293158.filter(c)
return c:IsFacedown() and c:IsDestructable()
end
......
......@@ -33,6 +33,7 @@ function c16392422.initial_effect(c)
e6:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e6:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e6:SetCode(EVENT_BATTLE_DAMAGE)
e6:SetCondition(c16392422.condition)
e6:SetTarget(c16392422.target)
e6:SetOperation(c16392422.operation)
c:RegisterEffect(e6)
......@@ -63,6 +64,9 @@ function c16392422.dircon(e)
return Duel.IsExistingMatchingCard(c16392422.dirfilter1,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil)
and not Duel.IsExistingMatchingCard(c16392422.dirfilter2,e:GetHandlerPlayer(),0,LOCATION_MZONE,1,nil)
end
function c16392422.condition(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function c16392422.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
Duel.SetTargetPlayer(tp)
......
......@@ -44,17 +44,17 @@ function c2403771.thop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c2403771.repfilter(c)
return c:IsType(TYPE_SPELL) and not c:IsStatus(STATUS_DESTROY_CONFIRMED)
return c:IsType(TYPE_SPELL) and c:IsLocation(LOCATION_SZONE) and not c:IsStatus(STATUS_DESTROY_CONFIRMED)
end
function c2403771.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
if chk==0 then
local g=c:GetEquipGroup()
local res=g:IsExists(c2403771.repfilter,1,nil)
return not c:IsReason(REASON_REPLACE) and res
return not c:IsReason(REASON_REPLACE) and g:IsExists(c2403771.repfilter,1,nil)
end
if Duel.SelectYesNo(tp,aux.Stringid(2403771,1)) then
local g=c:GetEquipGroup()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local sg=g:FilterSelect(tp,c2403771.repfilter,1,1,nil)
Duel.SetTargetCard(sg)
return true
......
......@@ -6,6 +6,7 @@ function c29267084.initial_effect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
e1:SetCondition(c29267084.condition)
e1:SetTarget(c29267084.target)
e1:SetOperation(c29267084.operation)
c:RegisterEffect(e1)
......@@ -18,6 +19,9 @@ function c29267084.initial_effect(c)
e2:SetOperation(c29267084.desop)
c:RegisterEffect(e2)
end
function c29267084.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
end
function c29267084.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsFaceup() end
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end
......
......@@ -20,10 +20,7 @@ function c31034919.target(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)
end
function c31034919.operation(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=Duel.SelectMatchingCard(tp,Card.IsAbleToGrave,tp,LOCATION_HAND,0,2,2,nil)
if g:GetCount()==2 then
Duel.SendtoGrave(g,REASON_EFFECT)
Duel.Draw(tp,2,REASON_EFFECT)
end
if Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)<2 then return end
Duel.DiscardHand(tp,nil,2,2,REASON_EFFECT)
Duel.Draw(tp,2,REASON_EFFECT)
end
......@@ -32,7 +32,7 @@ function c3657444.initial_effect(c)
end
function c3657444.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() end
Duel.Remove(e:GetHandler(),POS_FACEUP,0)
Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
end
function c3657444.target1(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
......@@ -52,15 +52,13 @@ function c3657444.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectTarget(tp,c3657444.filter2,tp,LOCATION_MZONE,0,1,1,e:GetHandler())
local sg=g:Clone()
sg:AddCard(e:GetHandler())
Duel.SetOperationInfo(0,CATEGORY_REMOVE,sg,2,0,0)
g:AddCard(e:GetHandler())
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,2,0,0)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)
end
function c3657444.operation2(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
local tc=g:GetFirst()
local tc=Duel.GetFirstTarget()
if tc:IsFacedown() or not c:IsRelateToEffect(e) or not tc:IsRelateToEffect(e) then return end
local sg=Group.FromCards(c,tc)
Duel.Remove(sg,POS_FACEUP,REASON_EFFECT)
......@@ -76,7 +74,7 @@ function c3657444.target3(e,tp,eg,ep,ev,re,r,rp,chk)
and Duel.IsExistingMatchingCard(c3657444.filter3,tp,LOCATION_GRAVE,0,1,nil) end
Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,2,0,0)
Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,0,LOCATION_GRAVE)
Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_GRAVE)
end
function c3657444.operation3(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
......
......@@ -4,10 +4,15 @@ function c38834303.initial_effect(c)
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCost(c38834303.cost)
e1:SetTarget(c38834303.target)
e1:SetOperation(c38834303.activate)
c:RegisterEffect(e1)
end
function c38834303.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckLPCost(tp,500) end
Duel.PayLPCost(tp,500)
end
function c38834303.filter(c)
return c:GetCounter(0)~=0
end
......@@ -15,7 +20,7 @@ function c38834303.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c38834303.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
end
function c38834303.activate(e,tp,eg,ep,ev,re,r,rp)
local sg=Duel.GetMatchingGroup(c38834303.filter,tp,LOCATION_MZONE,0,nil)
local sg=Duel.GetMatchingGroup(c38834303.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
local tc=sg:GetFirst()
while tc do
tc:RemoveCounter(tp,0,0,0)
......
......@@ -32,6 +32,7 @@ function c42386471.initial_effect(c)
e6:SetCategory(CATEGORY_HANDES)
e6:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e6:SetCode(EVENT_BATTLE_DAMAGE)
e6:SetCondition(c42386471.condition)
e6:SetTarget(c42386471.target)
e6:SetOperation(c42386471.operation)
c:RegisterEffect(e6)
......@@ -62,6 +63,9 @@ function c42386471.dircon(e)
return Duel.IsExistingMatchingCard(c42386471.dirfilter1,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil)
and not Duel.IsExistingMatchingCard(c42386471.dirfilter2,e:GetHandlerPlayer(),0,LOCATION_MZONE,1,nil)
end
function c42386471.condition(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function c42386471.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,1-tp,1)
......
......@@ -6,10 +6,15 @@ function c42793609.initial_effect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
e1:SetHintTiming(TIMING_DAMAGE_STEP)
e1:SetCondition(c42793609.condition)
e1:SetTarget(c42793609.target)
e1:SetOperation(c42793609.operation)
c:RegisterEffect(e1)
end
function c42793609.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
end
function c42793609.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil)
......
......@@ -7,11 +7,15 @@ function c49204190.initial_effect(c)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(TIMING_DAMAGE_STEP)
e1:SetCondition(c49204190.condition)
e1:SetCost(c49204190.cost)
e1:SetTarget(c49204190.target)
e1:SetOperation(c49204190.activate)
c:RegisterEffect(e1)
end
function c49204190.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
end
function c49204190.cfilter(c)
return c:GetAttack()>0 and c:IsDiscardable()
end
......
......@@ -16,8 +16,8 @@ function c50412166.condition(e,tp,eg,ep,ev,re,r,rp)
return ph~=PHASE_MAIN2 and ph~=PHASE_END
end
function c50412166.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
Duel.SendtoGrave(e:GetHandler(),REASON_COST)
if chk==0 then return e:GetHandler():IsDiscardable() end
Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
end
function c50412166.operation(e,tp,eg,ep,ev,re,r,rp,chk)
local e1=Effect.CreateEffect(e:GetHandler())
......
--フォトン,トライデント
--フォトン・トライデント
function c51589188.initial_effect(c)
--Activate
local e1=Effect.CreateEffect(c)
......@@ -53,7 +53,7 @@ function c51589188.activate(e,tp,eg,ep,ev,re,r,rp)
end
end
function c51589188.descon(e,tp,eg,ep,ev,re,r,rp)
return eg:GetFirst()==e:GetLabelObject()
return ep~=tp and eg:GetFirst()==e:GetLabelObject()
end
function c51589188.desfilter(c)
return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDestructable()
......
......@@ -15,6 +15,7 @@ function c53839837.initial_effect(c)
e2:SetCondition(c53839837.spcon)
e2:SetTarget(c53839837.sptg)
e2:SetOperation(c53839837.spop)
e2:SetLabelObject(e1)
c:RegisterEffect(e2)
--to grave
local e3=Effect.CreateEffect(c)
......@@ -22,6 +23,7 @@ function c53839837.initial_effect(c)
e3:SetCategory(CATEGORY_TOGRAVE)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e3:SetCode(EVENT_BATTLE_DAMAGE)
e3:SetCondition(c53839837.tgcon)
e3:SetTarget(c53839837.tgtg)
e3:SetOperation(c53839837.tgop)
c:RegisterEffect(e3)
......@@ -53,6 +55,9 @@ function c53839837.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end
end
function c53839837.tgcon(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function c53839837.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(53839837,5))
......
......@@ -48,14 +48,14 @@ function c56948373.operation(e,tp,eg,ep,ev,re,r,rp)
end
end
function c56948373.damcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler():GetEquipTarget()
return c and Duel.GetTurnPlayer()==c:GetControler()
return Duel.GetTurnPlayer()==tp and e:GetHandler():GetEquipTarget()~=nil
end
function c56948373.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
Duel.SetTargetPlayer(Duel.GetTurnPlayer())
local p=e:GetHandler():GetEquipTarget():GetControler()
Duel.SetTargetPlayer(p)
Duel.SetTargetParam(500)
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,Duel.GetTurnPlayer(),500)
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,p,500)
end
function c56948373.damop(e,tp,eg,ep,ev,re,r,rp)
if not e:GetHandler():IsRelateToEffect(e) then return end
......
......@@ -70,6 +70,5 @@ function c59057152.spop(e,tp,eg,ep,ev,re,r,rp)
end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local dg=Duel.SelectMatchingCard(tp,c59057152.desfilter,tp,LOCATION_SZONE,0,1,1,nil)
Duel.BreakEffect()
Duel.Destroy(dg,REASON_EFFECT)
end
......@@ -6,10 +6,14 @@ function c68167124.initial_effect(c)
e1:SetCategory(CATEGORY_TOHAND)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e1:SetCode(EVENT_BATTLE_DAMAGE)
e1:SetCondition(c68167124.condition)
e1:SetTarget(c68167124.target)
e1:SetOperation(c68167124.operation)
c:RegisterEffect(e1)
end
function c68167124.condition(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function c68167124.filter(c)
return c:IsFaceup() and c:GetSequence()~=5
end
......
......@@ -5,6 +5,7 @@ function c70089580.initial_effect(c)
e1:SetDescription(aux.Stringid(70089580,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
e1:SetCode(EVENT_BATTLE_DESTROYED)
e1:SetCondition(c70089580.condition)
e1:SetCost(c70089580.cost)
......
......@@ -52,16 +52,20 @@ function c76067258.operation(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget()
if c:IsFaceup() and c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) then
c:SetCardTarget(tc)
tc:RegisterFlagEffect(76067258,RESET_EVENT+0x1fe0000,0,0)
end
end
function c76067258.indtg(e,c)
return e:GetHandler():IsHasCardTarget(c)
return e:GetHandler():IsHasCardTarget(c) and c:GetFlagEffect(76067258)~=0
end
function c76067258.repfilter(c,tp)
return c:IsControler(tp) and c:GetFlagEffect(76067258)~=0
end
function c76067258.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():GetFirstCardTarget()~=nil end
if chk==0 then return e:GetHandler():GetCardTarget():IsExists(c76067258.repfilter,1,nil,tp) end
if Duel.SelectYesNo(tp,aux.Stringid(76067258,1)) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=e:GetHandler():GetCardTarget():Select(tp,1,1,nil)
local g=e:GetHandler():GetCardTarget():FilterSelect(tp,c76067258.repfilter,1,1,nil,tp)
Duel.SendtoGrave(g,REASON_EFFECT)
return true
else return false end
......
......@@ -23,8 +23,8 @@ function c76214441.discon(e,tp,eg,ep,ev,re,r,rp)
(cp==PLAYER_ALL and (Duel.IsPlayerAffectedByEffect(0,EFFECT_REVERSE_RECOVER) or Duel.IsPlayerAffectedByEffect(1,EFFECT_REVERSE_RECOVER))))
end
function c76214441.discost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
Duel.SendtoGrave(e:GetHandler(),REASON_COST)
if chk==0 then return e:GetHandler():IsDiscardable() end
Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
end
function c76214441.distg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
......
......@@ -41,7 +41,7 @@ function c80513550.hspcon(e,c)
and Duel.IsExistingMatchingCard(c80513550.hspfilter,c:GetControler(),LOCATION_SZONE,0,3,nil)
end
function c80513550.hdcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler()==Duel.GetAttacker()
return ep~=tp and e:GetHandler()==Duel.GetAttacker()
end
function c80513550.hdtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
......
......@@ -43,6 +43,7 @@ function c8062132.initial_effect(c)
e6:SetCategory(CATEGORY_COUNTER)
e6:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
e6:SetCode(EVENT_BATTLE_DAMAGE)
e6:SetCondition(c8062132.ctcon)
e6:SetOperation(c8062132.ctop)
c:RegisterEffect(e6)
end
......@@ -71,6 +72,9 @@ function c8062132.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummon(e:GetHandler(),0,tp,tp,true,true,POS_FACEUP)
end
end
function c8062132.ctcon(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function c8062132.ctop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
c:AddCounter(0x11,1)
......
......@@ -114,7 +114,7 @@ function c84814897.atkop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget()
if tc:IsFaceup() and tc:IsRelateToEffect(e) then
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_EQUIP)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DIRECT_ATTACK)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1)
......
......@@ -17,7 +17,7 @@ function c92595545.initial_effect(c)
c:RegisterEffect(e2)
end
function c92595545.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetAttackTarget()==nil
return ep~=tp and Duel.GetAttackTarget()==nil
end
function c92595545.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true 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