Skip to content

Commit 88edddd

Browse files
committed
Importing fixes from Ygopro Percy up to 20 Feb 2020
1 parent 6bb1f52 commit 88edddd

File tree

11 files changed

+26
-30
lines changed

11 files changed

+26
-30
lines changed

official/c12496261.lua

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--ドラグニティナイト-ハールーン
2-
--Dragunity Knight – Harloon
2+
--Dragunity Knight – Luin
33
local s,id=GetID()
44
function s.initial_effect(c)
55
--synchro summon
@@ -49,7 +49,7 @@ function s.eqop(e,tp,eg,ep,ev,re,r,rp)
4949
if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
5050
local c=e:GetHandler()
5151
local tc=Duel.GetFirstTarget()
52-
if tc and tc:IsRelateToEffect(e) then
52+
if c:IsFaceup() and c:IsRelateToEffect(e) and tc and tc:IsRelateToEffect(e) then
5353
aux.EquipByEffectAndLimitRegister(c,e,tp,tc)
5454
end
5555
end
@@ -81,7 +81,7 @@ function s.eqop2(e,tp,eg,ep,ev,re,r,rp)
8181
e1:SetType(EFFECT_TYPE_SINGLE)
8282
e1:SetCode(EFFECT_EQUIP_LIMIT)
8383
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
84-
e1:SetValue(s.eqlimit2)
84+
e1:SetValue(true)
8585
e1:SetReset(RESET_EVENT+RESETS_STANDARD)
8686
c:RegisterEffect(e1)
8787
--equip effect
@@ -96,8 +96,3 @@ function s.eqop2(e,tp,eg,ep,ev,re,r,rp)
9696
c:RegisterEffect(e3)
9797
end
9898
end
99-
function s.eqlimit2(e,c)
100-
local tp=e:GetHandlerPlayer()
101-
return c:IsControler(tp)
102-
end
103-

official/c13650422.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ end
2424
s.listed_names={CARD_DARK_FUSION}
2525
function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
2626
local c=e:GetHandler()
27-
if chk==0 then return c:IsAbleToGraveAsCost() and c:IsDiscardable() end
27+
if chk==0 then return c:IsDiscardable() end
2828
Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
2929
end
3030
function s.thfilter(c)

official/c18175965.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,15 +102,15 @@ function s.spcon2(e,tp,eg,ep,ev,re,r,rp)
102102
return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
103103
end
104104
function s.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
105-
if chk==0 then return e:GetHandler():IsStatus(STATUS_PROC_COMPLETE) end
105+
if chk==0 then return true end
106106
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
107107
Duel.SetOperationInfo(0,CATEGORY_HANDES,0,0,tp,1)
108108
end
109109
function s.spop2(e,tp,eg,ep,ev,re,r,rp)
110110
local c=e:GetHandler()
111111
if Duel.DiscardHand(tp,nil,1,1,REASON_EFFECT)~=0 then
112112
local ct=Duel.GetOperatedGroup():FilterCount(Card.IsLocation,nil,LOCATION_GRAVE)
113-
if ct>0 and c:IsRelateToEffect(e) then
113+
if ct>0 and c:IsRelateToEffect(e) and c:IsStatus(STATUS_PROC_COMPLETE) then
114114
Duel.SpecialSummon(c,0,tp,tp,true,true,POS_FACEUP)
115115
end
116116
end

official/c24361622.lua

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--天球の聖刻印
2-
--Hieratic Seal of the Celestial Spheres
2+
--Hieratic Seal of the Heavenly Spheres
33
--Scripted by Eerie Code
44
local s,id=GetID()
55
function s.initial_effect(c)
@@ -23,7 +23,7 @@ function s.initial_effect(c)
2323
local e2=Effect.CreateEffect(c)
2424
e2:SetDescription(aux.Stringid(id,1))
2525
e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
26-
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
26+
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
2727
e2:SetCode(EVENT_RELEASE)
2828
e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
2929
e2:SetCountLimit(1,id)
@@ -58,8 +58,7 @@ function s.spfilter(c,e,tp)
5858
return c:IsRace(RACE_DRAGON) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
5959
end
6060
function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
61-
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
62-
and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,e,tp) end
61+
if chk==0 then return true end
6362
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_DECK)
6463
end
6564
function s.spop(e,tp,eg,ep,ev,re,r,rp)

official/c36328300.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--究極宝玉陣
2-
--Ultimate Crystal Formation
2+
--Ultimate Crystal Magic
33
local s,id=GetID()
44
function s.initial_effect(c)
55
--activate

official/c43641473.lua

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ function s.tcfilter(tc,ec)
1717
return tc:IsFaceup() and ec:CheckEquipTarget(tc)
1818
end
1919
function s.ecfilter(c)
20-
return c:IsType(TYPE_EQUIP) and c:GetEquipTarget()~=nil and Duel.IsExistingTarget(s.tcfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,c:GetEquipTarget(),c)
20+
return c:IsType(TYPE_EQUIP) and (not c:IsOriginalType(TYPE_MONSTER) or c:IsOriginalType(TYPE_UNION)) and c:GetEquipTarget()~=nil and Duel.IsExistingTarget(s.tcfilter,0,LOCATION_MZONE,LOCATION_MZONE,1,c:GetEquipTarget(),c)
2121
end
2222
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2323
if chkc then return false end
@@ -34,7 +34,11 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
3434
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
3535
local tc=g:GetFirst()
3636
if tc==ec then tc=g:GetNext() end
37-
if ec:IsFaceup() and ec:IsRelateToEffect(e) then
38-
Duel.Equip(tp,ec,tc)
37+
if ec:IsFaceup() and ec:IsRelateToEffect(e) then
38+
if tc:IsFaceup() and tc:IsRelateToEffect(e) then
39+
Duel.Equip(tp,ec,tc)
40+
else
41+
Duel.SendtoGrave(ec,REASON_EFFECT)
42+
end
3943
end
4044
end

official/c71348837.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
5454
local g=Duel.GetMatchingGroup(s.filter,tp,LOCATION_DECK,0,nil)
5555
if #g>0 then
5656
Duel.BreakEffect()
57+
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
5758
local sg=g:Select(tp,1,1,nil)
5859
Duel.SSet(tp,sg)
5960
Duel.ConfirmCards(1-tp,sg)

official/c74665651.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,5 +59,5 @@ function s.atfilter(c)
5959
end
6060
function s.atlimit(e,c)
6161
local g=Duel.GetMatchingGroup(s.atfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,nil)
62-
return c:IsFaceup() and c:IsSetCard(0x131) and g:GetMaxGroup(Card.GetLevel):IsContains(c)
62+
return c:IsFaceup() and c:IsSetCard(0x131) and not g:GetMaxGroup(Card.GetLevel):IsContains(c)
6363
end

official/c77297908.lua

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ function s.desfilter(c)
7979
return c:IsFacedown() and c:IsType(TYPE_SPELL+TYPE_TRAP)
8080
end
8181
function s.repop(e,tp,eg,ep,ev,re,r,rp)
82+
Duel.Hint(HINT_CARD,0,id)
8283
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
8384
local g=Duel.SelectMatchingCard(tp,s.desfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
8485
if #g>0 then

official/c81263643.lua

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
--幻姫フルドラ
2-
--Mystic Huldra
2+
--Mystrick Hulder
33
--Scripted by Eerie Code
44
local s,id=GetID()
55
function s.initial_effect(c)
@@ -8,15 +8,15 @@ function s.initial_effect(c)
88
e1:SetCategory(CATEGORY_TOHAND)
99
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
1010
e1:SetCode(EVENT_SUMMON_SUCCESS)
11-
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
11+
e1:SetProperty(EFFECT_FLAG_DELAY)
1212
e1:SetCountLimit(1,id)
1313
e1:SetCost(s.cost)
1414
e1:SetTarget(s.target)
1515
e1:SetOperation(s.operation)
1616
c:RegisterEffect(e1)
17-
local e2=e1:Clone()
18-
e2:SetCode(EVENT_SPSUMMON_SUCCESS)
19-
c:RegisterEffect(e2)
17+
local e2=e1:Clone()
18+
e2:SetCode(EVENT_SPSUMMON_SUCCESS)
19+
c:RegisterEffect(e2)
2020
end
2121
function s.cfilter(c,tp)
2222
if not c:IsDiscardable() then return false end
@@ -48,4 +48,3 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
4848
Duel.ConfirmCards(1-tp,g)
4949
end
5050
end
51-

0 commit comments

Comments
 (0)