Skip to content

Commit f8818f0

Browse files
committed
"Battle Royal Mode - Joining" fix
Fixed a bug in which the player would still be prompted to Special Summon a monster even when they did not have a zone available
1 parent 096fc9c commit f8818f0

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

official/c65433790.lua

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ local s,id=GetID()
55
function s.initial_effect(c)
66
--Activate by targeting 1 monster
77
aux.AddPersistentProcedure(c,PLAYER_ALL,aux.FaceupFilter(Card.IsType,TYPE_EFFECT))
8-
--Cannot be destroyed by battle the first two times
8+
--The first two times that monster would be destroyed by battle each turn, it is not destroyed
99
local e1=Effect.CreateEffect(c)
1010
e1:SetType(EFFECT_TYPE_FIELD)
1111
e1:SetCode(EFFECT_INDESTRUCTABLE_COUNT)
@@ -15,14 +15,14 @@ function s.initial_effect(c)
1515
e1:SetTarget(aux.PersistentTargetFilter)
1616
e1:SetValue(function(_,_,r) return r&REASON_BATTLE==REASON_BATTLE end)
1717
c:RegisterEffect(e1)
18-
--Destroying player gains 2000 LP
18+
--When it is destroyed by battle, the player that destroyed it gains 2000 LP
1919
local e2=Effect.CreateEffect(c)
2020
e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
2121
e2:SetRange(LOCATION_SZONE)
2222
e2:SetCode(EVENT_LEAVE_FIELD)
2323
e2:SetOperation(s.lpop)
2424
c:RegisterEffect(e2)
25-
--Special Summon 1 Level 4 or lower monster
25+
--Special Summon 1 Level 4 or lower monster from your hand or Deck, but lose 2000 LP
2626
local e3=Effect.CreateEffect(c)
2727
e3:SetDescription(aux.Stringid(id,0))
2828
e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
@@ -44,9 +44,10 @@ function s.spfilter(c,e,tp)
4444
end
4545
function s.spop(e,tp,eg,ep,ev,re,r,rp)
4646
local c=e:GetHandler()
47-
if not c:IsRelateToEffect(e)
48-
or not Duel.IsExistingMatchingCard(s.spfilter,ep,LOCATION_HAND|LOCATION_DECK,0,1,nil,e,ep)
49-
or not Duel.SelectYesNo(ep,aux.Stringid(id,1)) then return end
47+
if not (c:IsRelateToEffect(e)
48+
and Duel.GetLocationCount(ep,LOCATION_MZONE)>0
49+
and Duel.IsExistingMatchingCard(s.spfilter,ep,LOCATION_HAND|LOCATION_DECK,0,1,nil,e,ep)
50+
and Duel.SelectYesNo(ep,aux.Stringid(id,1)) then return end
5051
Duel.Hint(HINT_SELECTMSG,ep,HINTMSG_SPSUMMON)
5152
local sg=Duel.SelectMatchingCard(ep,s.spfilter,ep,LOCATION_HAND|LOCATION_DECK,0,1,1,nil,e,ep)
5253
if #sg>0 and Duel.SpecialSummon(sg,0,ep,ep,false,false,POS_FACEUP)>0 then

0 commit comments

Comments
 (0)