Commit ce13031e authored by salix5's avatar salix5

Merge pull request #1460 from DailyShana/patch-4

fix
parents 3dd5394f 82d6eb06
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
function c14816688.initial_effect(c) function c14816688.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(14816688,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
...@@ -12,6 +13,7 @@ function c14816688.initial_effect(c) ...@@ -12,6 +13,7 @@ function c14816688.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--todeck --todeck
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(14816688,1))
e2:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW) e2:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET) e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
e2:SetType(EFFECT_TYPE_IGNITION) e2:SetType(EFFECT_TYPE_IGNITION)
......
...@@ -20,7 +20,7 @@ function c27995943.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -20,7 +20,7 @@ function c27995943.cost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.PayLPCost(tp,500) Duel.PayLPCost(tp,500)
end end
function c27995943.target(e,tp,eg,ep,ev,re,r,rp,chk) function c27995943.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,1) end if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0 end
end end
function c27995943.operation(e,tp,eg,ep,ev,re,r,rp) function c27995943.operation(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetDecktopGroup(tp,1) local g=Duel.GetDecktopGroup(tp,1)
......
...@@ -8,6 +8,7 @@ function c33245030.initial_effect(c) ...@@ -8,6 +8,7 @@ function c33245030.initial_effect(c)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCondition(c33245030.condition) e1:SetCondition(c33245030.condition)
e1:SetCost(c33245030.cost) e1:SetCost(c33245030.cost)
e1:SetTarget(c33245030.target)
e1:SetOperation(c33245030.operation) e1:SetOperation(c33245030.operation)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--ritual material --ritual material
...@@ -24,6 +25,9 @@ function c33245030.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -24,6 +25,9 @@ function c33245030.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
Duel.SendtoGrave(e:GetHandler(),REASON_COST) Duel.SendtoGrave(e:GetHandler(),REASON_COST)
end end
function c33245030.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetAttacker():IsAttackPos() end
end
function c33245030.operation(e,tp,eg,ep,ev,re,r,rp) function c33245030.operation(e,tp,eg,ep,ev,re,r,rp)
local at=Duel.GetAttacker() local at=Duel.GetAttacker()
if at:IsAttackPos() and at:IsRelateToBattle() then if at:IsAttackPos() and at:IsRelateToBattle() then
......
...@@ -43,14 +43,15 @@ function c53262004.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,14 +43,15 @@ function c53262004.thop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c53262004.discon(e,tp,eg,ep,ev,re,r,rp) function c53262004.discon(e,tp,eg,ep,ev,re,r,rp)
return re:GetHandler()~=e:GetHandler() and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) and Duel.IsChainNegatable(ev) return re:GetHandler()~=e:GetHandler() and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
and (re:IsActiveType(TYPE_MONSTER) or re:IsHasType(EFFECT_TYPE_ACTIVATE)) and Duel.IsChainNegatable(ev)
end end
function c53262004.disfilter(c) function c53262004.disfilter(c)
return c:IsFaceup() and c:IsType(TYPE_PENDULUM) and c:IsAbleToDeck() return c:IsFaceup() and c:IsType(TYPE_PENDULUM) and c:IsAbleToDeck()
end end
function c53262004.distg(e,tp,eg,ep,ev,re,r,rp,chk) function c53262004.distg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c53262004.disfilter,tp,LOCATION_EXTRA,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c53262004.disfilter,tp,LOCATION_EXTRA,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,1-tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_EXTRA)
Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then if re:GetHandler():IsDestructable() and re:GetHandler():IsRelateToEffect(re) then
Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,1,0,0)
......
...@@ -30,8 +30,9 @@ function c70456282.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -30,8 +30,9 @@ function c70456282.spop(e,tp,eg,ep,ev,re,r,rp,c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_ADD_TYPE) e1:SetCode(EFFECT_ADD_TYPE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetValue(TYPE_TUNER) e1:SetValue(TYPE_TUNER)
e1:SetReset(RESET_EVENT+0xff0000) e1:SetReset(RESET_EVENT+0x1fe0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c70456282.filter(c) function c70456282.filter(c)
......
...@@ -40,7 +40,7 @@ function c74416026.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,7 +40,7 @@ function c74416026.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local tc=tg:Select(tp,1,1,nil) local tc=tg:Select(tp,1,1,nil)
if Duel.SendtoGrave(tc,REASON_EFFECT)==0 then return end if Duel.SendtoGrave(tc,REASON_EFFECT)==0 or not tc:IsLocation(LOCATION_GRAVE) then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local sc=sg:Select(tp,1,1,nil):GetFirst() local sc=sg:Select(tp,1,1,nil):GetFirst()
if Duel.SpecialSummonStep(sc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP) then if Duel.SpecialSummonStep(sc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP) then
......
...@@ -35,7 +35,7 @@ function c75249652.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,7 +35,7 @@ function c75249652.activate(e,tp,eg,ep,ev,re,r,rp)
tc=dg:GetNext() tc=dg:GetNext()
end end
local dam=Duel.Damage(tp,atk/2,REASON_EFFECT) local dam=Duel.Damage(tp,atk/2,REASON_EFFECT)
if dam>0 then if Duel.GetLP(tp)>0 and dam>0 then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Damage(1-tp,dam,REASON_EFFECT) Duel.Damage(1-tp,dam,REASON_EFFECT)
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