Skip to content

Commit 16e774e

Browse files
committed
Fixed scripts with wrong operator precedence
Affected cards: Magical Musketeer Kidbrave, Magical Musketeer Calamity, Magical Musketeer Wild and Dragon's Roar
1 parent c0dbc2e commit 16e774e

File tree

4 files changed

+19
-20
lines changed

4 files changed

+19
-20
lines changed

official/c5230799.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ function s.initial_effect(c)
3030
end
3131
s.listed_series={SET_MAGICAL_MUSKET}
3232
function s.drcon(e,tp,eg,ep,ev,re,r,rp)
33+
if Duel.GetCurrentPhase()&(PHASE_DAMAGE|PHASE_DAMAGE_CAL)>0 or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
3334
local c=e:GetHandler()
34-
local rc=re:GetHandler()
35-
if Duel.GetCurrentPhase()&PHASE_DAMAGE|PHASE_DAMAGE_CAL~=0 or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
36-
local p,loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
35+
local p,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_SEQUENCE)
3736
return c:IsColumn(seq,p,LOCATION_SZONE)
3837
end
3938
function s.cfilter(c)

official/c68024506.lua

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ function s.initial_effect(c)
1818
local e3=Effect.CreateEffect(c)
1919
e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
2020
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
21-
e3:SetCode(EVENT_CHAINING)
2221
e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
22+
e3:SetCode(EVENT_CHAINING)
2323
e3:SetRange(LOCATION_MZONE)
2424
e3:SetCountLimit(1,id)
2525
e3:SetCondition(s.spcon)
@@ -29,22 +29,21 @@ function s.initial_effect(c)
2929
end
3030
s.listed_series={SET_MAGICAL_MUSKET}
3131
function s.spcon(e,tp,eg,ep,ev,re,r,rp)
32+
if Duel.GetCurrentPhase()&(PHASE_DAMAGE|PHASE_DAMAGE_CAL)>0 or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
3233
local c=e:GetHandler()
33-
local rc=re:GetHandler()
34-
if Duel.GetCurrentPhase()&PHASE_DAMAGE|PHASE_DAMAGE_CAL~=0 or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
35-
local p,loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
34+
local p,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_SEQUENCE)
3635
return c:IsColumn(seq,p,LOCATION_SZONE)
3736
end
38-
function s.filter(c,e,tp)
37+
function s.spfilter(c,e,tp)
3938
return c:IsSetCard(SET_MAGICAL_MUSKET) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
4039
end
4140
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
42-
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and s.filter(chkc,e,tp) end
41+
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and s.spfilter(chkc,e,tp) end
4342
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
44-
and Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
43+
and Duel.IsExistingTarget(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
4544
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
46-
local g=Duel.SelectTarget(tp,s.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
47-
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
45+
local g=Duel.SelectTarget(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
46+
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,tp,0)
4847
end
4948
function s.spop(e,tp,eg,ep,ev,re,r,rp)
5049
local tc=Duel.GetFirstTarget()

official/c94418111.lua

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,9 @@ function s.initial_effect(c)
3030
end
3131
s.listed_series={SET_MAGICAL_MUSKET}
3232
function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
33+
if Duel.GetCurrentPhase()&(PHASE_DAMAGE|PHASE_DAMAGE_CAL)>0 or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
3334
local c=e:GetHandler()
34-
local rc=re:GetHandler()
35-
if Duel.GetCurrentPhase()&PHASE_DAMAGE|PHASE_DAMAGE_CAL~=0 or not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
36-
local p,loc,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_SEQUENCE)
35+
local p,seq=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_CONTROLER,CHAININFO_TRIGGERING_SEQUENCE)
3736
return c:IsColumn(seq,p,LOCATION_SZONE)
3837
end
3938
function s.filter(c)

unofficial/c511002168.lua

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
--Dragon Cry
1+
--ドラゴン・クライ
2+
--Dragon's Roar
23
local s,id=GetID()
34
function s.initial_effect(c)
4-
--Activate
5+
--Your opponent cannot attack this turn
56
local e1=Effect.CreateEffect(c)
7+
e1:SetDescription(aux.Stringid(id,0))
68
e1:SetType(EFFECT_TYPE_ACTIVATE)
79
e1:SetCode(EVENT_FREE_CHAIN)
8-
e1:SetHintTiming(0,TIMING_MAIN_END)
10+
e1:SetHintTiming(0,TIMING_MAIN_END|TIMING_BATTLE_START)
911
e1:SetCondition(s.condition)
1012
e1:SetOperation(s.activate)
1113
c:RegisterEffect(e1)
@@ -15,15 +17,15 @@ function s.cfilter(c)
1517
end
1618
function s.condition(e,tp,eg,ep,ev,re,r,rp)
1719
local ph=Duel.GetCurrentPhase()
18-
return tp~=Duel.GetTurnPlayer() and (ph&PHASE_MAIN2+PHASE_END)==0
20+
return Duel.IsTurnPlayer(1-tp) and ph&(PHASE_MAIN2|PHASE_END)==0
1921
and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil)
2022
end
2123
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2224
local e1=Effect.CreateEffect(e:GetHandler())
2325
e1:SetType(EFFECT_TYPE_FIELD)
2426
e1:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE)
2527
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
26-
e1:SetReset(RESET_PHASE+PHASE_END)
28+
e1:SetReset(RESET_PHASE|PHASE_END)
2729
e1:SetTargetRange(0,1)
2830
Duel.RegisterEffect(e1,tp)
2931
end

0 commit comments

Comments
 (0)