Skip to content

Commit 0a3857a

Browse files
authored
Some card fixes
- Artmage Non Finito: The Tributed monster should be treated as Fusion Material. - Solfachord Happiness: The first effect should always be considered an effect that includes Special Summoning. - Surprise Chain: The first effect should excavate the cards, not just have the player look at them.
1 parent 95ac055 commit 0a3857a

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

official/c70491413.lua

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,16 +26,19 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
2626
if cl>=4 then Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1) end
2727
end
2828
function s.activate(e,tp,eg,ep,ev,re,r,rp)
29+
local break_chk=false
2930
local cl=Duel.GetCurrentChain()
3031
if cl>=2 then
32+
break_chk=true
33+
Duel.ConfirmDecktop(tp,cl)
3134
Duel.SortDecktop(tp,tp,cl)
3235
end
3336
if cl>=3 and Duel.IsPlayerCanDiscardDeck(tp,1) then
34-
Duel.BreakEffect()
37+
if break_chk then Duel.BreakEffect() end
3538
Duel.DiscardDeck(tp,1,REASON_EFFECT)
3639
end
3740
if cl>=4 then
38-
Duel.BreakEffect()
41+
if break_chk then Duel.BreakEffect() end
3942
Duel.Draw(tp,1,REASON_EFFECT)
4043
end
4144
end

official/c93481594.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
3838
e:SetLabel(op)
3939
Duel.RegisterFlagEffect(tp,id+op,RESET_PHASE|PHASE_END,0,1)
4040
if op==1 then
41-
e:SetCategory(CATEGORY_HANDES+CATEGORY_TOHAND+CATEGORY_SEARCH)
41+
e:SetCategory(CATEGORY_HANDES+CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_SPECIAL_SUMMON)
4242
Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,tp,1)
4343
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,2,tp,LOCATION_DECK)
4444
Duel.SetPossibleOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
@@ -82,4 +82,4 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp)
8282
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
8383
end
8484
end
85-
end
85+
end

pre-release/c101303035.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function s.regop(e,tp,eg,ep,ev,re,r,rp)
7171
Duel.RegisterEffect(e1,tp)
7272
end
7373
function s.selfspcostfilter(c,tp,fc)
74-
return c:IsLevelAbove(7) and c:IsSetCard(SET_ARTMAGE) and Duel.GetLocationCountFromEx(tp,tp,c,fc)>0
74+
return c:IsLevelAbove(7) and c:IsSetCard(SET_ARTMAGE,fc,SUMMON_TYPE_SPECIAL+1,tp) and Duel.GetLocationCountFromEx(tp,tp,c,fc)>0
7575
end
7676
function s.selfspcon(e,c)
7777
if not c then return true end

0 commit comments

Comments
 (0)