Commit 3d57d662 authored by VanillaSalt's avatar VanillaSalt

fix

parent 76d085be
...@@ -35,7 +35,7 @@ function c19310321.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -35,7 +35,7 @@ function c19310321.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function c19310321.activate(e,tp,eg,ep,ev,re,r,rp) function c19310321.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject() local tc=e:GetLabelObject()
if tc:IsFacedown() or not tc:IsRelateToEffect(e) then return end if tc:IsFacedown() or not tc:IsRelateToEffect(e) or tc:IsImmuneToEffect(e) then return end
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,tc,e) local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,tc,e)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.Overlay(tc,g) Duel.Overlay(tc,g)
......
...@@ -6,8 +6,8 @@ function c44256816.initial_effect(c) ...@@ -6,8 +6,8 @@ function c44256816.initial_effect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCountLimit(1,44256816+EFFECT_COUNT_CODE_OATH) e1:SetCountLimit(1,44256816+EFFECT_COUNT_CODE_OATH)
e1:SetCondition(c44256816.condition)
e1:SetCost(c44256816.cost) e1:SetCost(c44256816.cost)
e1:SetCondition(c44256816.con)
e1:SetTarget(c44256816.target) e1:SetTarget(c44256816.target)
e1:SetOperation(c44256816.activate) e1:SetOperation(c44256816.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -33,7 +33,7 @@ function c44256816.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -33,7 +33,7 @@ function c44256816.checkop(e,tp,eg,ep,ev,re,r,rp)
if p1 then Duel.RegisterFlagEffect(0,44256816,RESET_PHASE+PHASE_END,0,1) end if p1 then Duel.RegisterFlagEffect(0,44256816,RESET_PHASE+PHASE_END,0,1) end
if p2 then Duel.RegisterFlagEffect(1,44256816,RESET_PHASE+PHASE_END,0,1) end if p2 then Duel.RegisterFlagEffect(1,44256816,RESET_PHASE+PHASE_END,0,1) end
end end
function c44256816.con(e,tp,eg,ep,ev,re,r,rp) function c44256816.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0
end end
function c44256816.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c44256816.cost(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -3,7 +3,7 @@ function c52339733.initial_effect(c) ...@@ -3,7 +3,7 @@ function c52339733.initial_effect(c)
--atk --atk
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e1:SetCode(EVENT_DAMAGE_CALCULATING) e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCondition(c52339733.atkcon) e1:SetCondition(c52339733.atkcon)
e1:SetOperation(c52339733.atkop) e1:SetOperation(c52339733.atkop)
......
...@@ -25,6 +25,7 @@ function c65305468.initial_effect(c) ...@@ -25,6 +25,7 @@ function c65305468.initial_effect(c)
local e5=Effect.CreateEffect(c) local e5=Effect.CreateEffect(c)
e5:SetType(EFFECT_TYPE_SINGLE) e5:SetType(EFFECT_TYPE_SINGLE)
e5:SetCode(EFFECT_AVOID_BATTLE_DAMAGE) e5:SetCode(EFFECT_AVOID_BATTLE_DAMAGE)
e5:SetValue(1)
c:RegisterEffect(e5) c:RegisterEffect(e5)
--control --control
local e6=Effect.CreateEffect(c) local e6=Effect.CreateEffect(c)
...@@ -84,7 +85,7 @@ function c65305468.cttg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -84,7 +85,7 @@ function c65305468.cttg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c65305468.ctop(e,tp,eg,ep,ev,re,r,rp) function c65305468.ctop(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetHandler():GetBattleTarget() local tc=e:GetHandler():GetBattleTarget()
if tc:IsRelateToEffect(e) and not Duel.GetControl(tc,tp,PHASE_BATTLE,1) then if tc:IsRelateToBattle() and not Duel.GetControl(tc,tp,PHASE_BATTLE,1) then
if not tc:IsImmuneToEffect(e) and tc:IsAbleToChangeControler() then if not tc:IsImmuneToEffect(e) and tc:IsAbleToChangeControler() then
Duel.Destroy(tc,REASON_EFFECT) Duel.Destroy(tc,REASON_EFFECT)
end end
......
...@@ -37,6 +37,7 @@ function c66127916.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -37,6 +37,7 @@ function c66127916.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
local tc=Duel.GetFirstMatchingCard(c66127916.filter3,tp,LOCATION_GRAVE,0,nil) local tc=Duel.GetFirstMatchingCard(c66127916.filter3,tp,LOCATION_GRAVE,0,nil)
if tc and Duel.SelectYesNo(tp,aux.Stringid(66127916,0)) then if tc and Duel.SelectYesNo(tp,aux.Stringid(66127916,0)) then
Duel.BreakEffect()
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
end end
......
...@@ -155,7 +155,9 @@ function c74822425.splimit(e,se,sp,st) ...@@ -155,7 +155,9 @@ function c74822425.splimit(e,se,sp,st)
end end
function c74822425.discon(e,tp,eg,ep,ev,re,r,rp) function c74822425.discon(e,tp,eg,ep,ev,re,r,rp)
if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end if e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED) then return false end
return rp~=tp and bit.band(re:GetHandler():GetSummonType(),SUMMON_TYPE_SPECIAL)==SUMMON_TYPE_SPECIAL local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)
return loc==LOCATION_MZONE and re:IsActiveType(TYPE_MONSTER)
and bit.band(re:GetHandler():GetSummonType(),SUMMON_TYPE_SPECIAL)==SUMMON_TYPE_SPECIAL
and Duel.IsChainNegatable(ev) and Duel.IsChainNegatable(ev)
end end
function c74822425.filter(c) function c74822425.filter(c)
......
...@@ -42,15 +42,17 @@ function c86062400.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -42,15 +42,17 @@ function c86062400.tgop(e,tp,eg,ep,ev,re,r,rp)
if bc:IsFaceup() and bc:IsRelateToBattle() then if bc:IsFaceup() and bc:IsRelateToBattle() then
local rk=bc:GetRank() local rk=bc:GetRank()
local g=nil local g=nil
local tg=Duel.GetFieldGroup(tp,0,LOCATION_EXTRA)
if rk<4 then if rk<4 then
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE)
g=Duel.SelectMatchingCard(1-tp,nil,tp,0,LOCATION_EXTRA,1,1,nil) g=tg:Select(1-tp,1,1,nil)
elseif rk==4 then elseif rk==4 then
Duel.ConfirmCards(tp,tg)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
g=Duel.SelectMatchingCard(tp,nil,tp,0,LOCATION_EXTRA,1,1,nil) g=tg:Select(tp,1,1,nil)
else else
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE)
g=Duel.SelectMatchingCard(1-tp,nil,tp,0,LOCATION_EXTRA,rk,rk,nil) g=tg:Select(1-tp,rk,rk,nil)
end end
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoGrave(g,REASON_EFFECT) Duel.SendtoGrave(g,REASON_EFFECT)
......
...@@ -5,6 +5,7 @@ function c86767655.initial_effect(c) ...@@ -5,6 +5,7 @@ function c86767655.initial_effect(c)
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_CHAIN_SOLVING) e1:SetCode(EVENT_CHAIN_SOLVING)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1,86767655)
e1:SetCondition(c86767655.discon) e1:SetCondition(c86767655.discon)
e1:SetOperation(c86767655.disop) e1:SetOperation(c86767655.disop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
...@@ -66,13 +66,15 @@ function c87602890.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,13 +66,15 @@ function c87602890.operation(e,tp,eg,ep,ev,re,r,rp)
end end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g1=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_EXTRA,0,lv,lv,nil) local g1=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_EXTRA,0,lv,lv,nil)
local tg=Duel.GetFieldGroup(tp,0,LOCATION_EXTRA)
if e:GetLabel()==1 then if e:GetLabel()==1 then
Duel.ConfirmCards(tp,tg)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g2=Duel.SelectMatchingCard(tp,nil,tp,0,LOCATION_EXTRA,lv,lv,nil) local g2=tg:Select(tp,lv,lv,nil)
g1:Merge(g2) g1:Merge(g2)
else else
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE)
local g2=Duel.SelectMatchingCard(1-tp,nil,tp,0,LOCATION_EXTRA,lv,lv,nil) local g2=tg:Select(1-tp,lv,lv,nil)
g1:Merge(g2) g1:Merge(g2)
end end
if g1:GetCount()>0 then if g1:GetCount()>0 then
......
...@@ -379,6 +379,7 @@ ...@@ -379,6 +379,7 @@
!victory 0x18 「混沌No.88 机关傀儡-灾厄狮子」效果胜利 !victory 0x18 「混沌No.88 机关傀儡-灾厄狮子」效果胜利
!victory 0x19 「头奖壶7」效果胜利 !victory 0x19 「头奖壶7」效果胜利
!victory 0x1a 「魂之接力」效果胜利 !victory 0x1a 「魂之接力」效果胜利
!victory 0x1b 「幽鬼驮天使」效果胜利
!victory 0x20 由于「%ls」的效果获得比赛胜利 !victory 0x20 由于「%ls」的效果获得比赛胜利
#counters #counters
!counter 0x3001 魔力指示物 !counter 0x3001 魔力指示物
...@@ -430,4 +431,4 @@ ...@@ -430,4 +431,4 @@
!counter 0x2f 南瓜指示物 !counter 0x2f 南瓜指示物
!counter 0x30 毅飞冲天指示物 !counter 0x30 毅飞冲天指示物
!counter 0x31 希望剑指示物 !counter 0x31 希望剑指示物
!counter 0x32 气球指示物
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