Skip to content

Commit 23b67b5

Browse files
committed
Fix for Rush cards
- Transfer Maintenance: it was unable to shuffle Extra Deck monster as its requirement - Praime Requiem: added a description with the correct string for the first effect - Vanishing Heliacal Riser: it should only shuffle the player's deck if a card actually ended up in the main Deck -- The Royal Crown of Zeil: it should not prevent an Union Fusion from returning the equipped monster to the Deck
1 parent 188c4b9 commit 23b67b5

4 files changed

Lines changed: 11 additions & 3 deletions

File tree

‎rush/c160027021.lua‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ function s.eqeffect(c,tc)
5353
e2:SetType(EFFECT_TYPE_EQUIP)
5454
e2:SetCode(EFFECT_CANNOT_TO_DECK)
5555
e2:SetValue(1)
56+
e2:SetCondition(s.noreturncondition)
5657
c:RegisterEffect(e2)
5758
local e3=e2:Clone()
5859
e3:SetCode(EFFECT_CANNOT_TO_HAND)
@@ -67,4 +68,8 @@ function s.eqeffect(c,tc)
6768
end
6869
function s.eqlimit(e,c)
6970
return c:IsFaceup()
71+
end
72+
function s.noreturncondition(e)
73+
local source_eff=Duel.GetReasonEffect()
74+
return source_eff and (source_eff:IsActivated() or not source_eff:GetCode()==EFFECT_SPSUMMON_PROC)
7075
end

‎rush/c160027050.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function s.initial_effect(c)
2424
c:RegisterEffect(e1)
2525
end
2626
function s.costfilter(c)
27-
return c:IsRace(RACE_DRAGON) and c:IsMonster() and c:IsAbleToDeckAsCost()
27+
return c:IsRace(RACE_DRAGON) and c:IsMonster() and c:IsAbleToDeckOrExtraAsCost()
2828
end
2929
function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
3030
if chk==0 then return Duel.GetMatchingGroupCount(s.costfilter,tp,LOCATION_GRAVE,0,nil)>=2 end

‎rush/c160313001.lua‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
--scripted by YoshiDuels
44
local s,id=GetID()
55
function s.initial_effect(c)
6-
--Gain ATK
6+
--This card gains 200 ATK until the end of this turn. If a face-up Spell Card is on the field, you can draw 1 card.
77
local e1=Effect.CreateEffect(c)
88
e1:SetDescription(aux.Stringid(id,0))
99
e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DRAW)
@@ -34,7 +34,9 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
3434
if #g>0 then
3535
Duel.HintSelection(g)
3636
if Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_COST)>0 then
37-
Duel.ShuffleDeck(tp)
37+
if g:IsExists(Card.IsLocation,1,nil,LOCATION_DECK) then
38+
Duel.ShuffleDeck(tp)
39+
end
3840
--Effect
3941
local c=e:GetHandler()
4042
local e1=Effect.CreateEffect(c)

‎rush/c160461042.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@ function s.initial_effect(c)
77
local e1=aux.AddNormalSummonProcedure(c,true,true,1,1,SUMMON_TYPE_TRIBUTE,aux.Stringid(id,0),nil,s.otop)
88
--This card gains ATK equal to [the number of face-up LIGHT Attribute monsters on your field] x 300 until the end of this turn. Then, you can add 1 "Praime Call" from your Graveyard to your hand.
99
local e2=Effect.CreateEffect(c)
10+
e2:SetDescription(aux.Stringid(id,1))
1011
e2:SetCategory(CATEGORY_ATKCHANGE|CATEGORY_TOHAND)
1112
e2:SetType(EFFECT_TYPE_IGNITION)
1213
e2:SetRange(LOCATION_MZONE)

0 commit comments

Comments
 (0)