Commit d4f84633 authored by VanillaSalt's avatar VanillaSalt

fix

parent f25dec51
...@@ -85,9 +85,8 @@ end ...@@ -85,9 +85,8 @@ end
function c18386170.fscon(e,g,gc,chkf) function c18386170.fscon(e,g,gc,chkf)
if g==nil then return true end if g==nil then return true end
if gc then if gc then
local mg=g local mg=g:Filter(Card.IsSetCard,nil,0xb1)
mg:AddCard(gc) mg:AddCard(gc)
mg=mg:Filter(Card.IsSetCard,nil,0xb1)
return gc:IsSetCard(0xb1) and mg:GetClassCount(Card.GetCode)>=3 return gc:IsSetCard(0xb1) and mg:GetClassCount(Card.GetCode)>=3
end end
local fs=false local fs=false
...@@ -98,6 +97,7 @@ end ...@@ -98,6 +97,7 @@ end
function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf) function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
if gc then if gc then
local sg=eg:Filter(Card.IsSetCard,gc,0xb1) local sg=eg:Filter(Card.IsSetCard,gc,0xb1)
sg:Remove(Card.IsCode,nil,gc:GetCode())
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
local g1=sg:Select(tp,1,1,nil) local g1=sg:Select(tp,1,1,nil)
sg:Remove(Card.IsCode,nil,g1:GetFirst():GetCode()) sg:Remove(Card.IsCode,nil,g1:GetFirst():GetCode())
...@@ -107,7 +107,7 @@ function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf) ...@@ -107,7 +107,7 @@ function c18386170.fsop(e,tp,eg,ep,ev,re,r,rp,gc,chkf)
Duel.SetFusionMaterial(g1) Duel.SetFusionMaterial(g1)
return return
end end
local sg=eg:Filter(Card.IsSetCard,gc,0xb1) local sg=eg:Filter(Card.IsSetCard,nil,0xb1)
local g1=nil local g1=nil
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FMATERIAL)
if chkf~=PLAYER_NONE then g1=sg:FilterSelect(tp,aux.FConditionCheckF,1,1,nil,chkf) if chkf~=PLAYER_NONE then g1=sg:FilterSelect(tp,aux.FConditionCheckF,1,1,nil,chkf)
......
...@@ -18,7 +18,7 @@ function c19508728.initial_effect(c) ...@@ -18,7 +18,7 @@ function c19508728.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
--atk --atk
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetCategory(CATEGORY_ATKCHANGE) e3:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e3:SetCode(EVENT_PRE_DAMAGE_CALCULATE) e3:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
e3:SetRange(LOCATION_SZONE) e3:SetRange(LOCATION_SZONE)
...@@ -71,6 +71,9 @@ function c19508728.atkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,6 +71,9 @@ function c19508728.atkop(e,tp,eg,ep,ev,re,r,rp)
end end
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_DAMAGE_CAL) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_DAMAGE_CAL)
ec:RegisterEffect(e1) ec:RegisterEffect(e1)
local e2=e1:Clone()
e2:SetCode(EFFECT_SET_DEFENCE_FINAL)
ec:RegisterEffect(e2)
end end
end end
function c19508728.tdcon(e,tp,eg,ep,ev,re,r,rp) function c19508728.tdcon(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -100,10 +100,10 @@ function c44771289.atkfilter(c) ...@@ -100,10 +100,10 @@ function c44771289.atkfilter(c)
return c:IsFaceup() and c:IsSetCard(0xb1) return c:IsFaceup() and c:IsSetCard(0xb1)
end end
function c44771289.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c44771289.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c44771289.atkfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and c44771289.atkfilter(chkc) end
if chk==0 then return Duel.IsExistingTarget(c44771289.atkfilter,tp,LOCATION_MZONE,0,1,nil) end if chk==0 then return Duel.IsExistingTarget(c44771289.atkfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
Duel.SelectTarget(tp,c44771289.atkfilter,tp,LOCATION_MZONE,0,1,1,nil) Duel.SelectTarget(tp,c44771289.atkfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
end end
function c44771289.atkop(e,tp,eg,ep,ev,re,r,rp) function c44771289.atkop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
......
...@@ -27,6 +27,7 @@ function c82114013.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -27,6 +27,7 @@ function c82114013.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
end end
function c82114013.spop(e,tp,eg,ep,ev,re,r,rp) function c82114013.spop(e,tp,eg,ep,ev,re,r,rp)
if not e:GetHandler():IsRelateToEffect(e) then return end
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,c82114013.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,c82114013.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment