Commit fe659c72 authored by VanillaSalt's avatar VanillaSalt

fix

parent 75e3b501
...@@ -3279,6 +3279,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret ...@@ -3279,6 +3279,7 @@ int32 field::move_to_field(uint16 step, card * target, uint32 enable, uint32 ret
else else
flag = ((flag << 16) & 0xff0000) | 0xff00ffff; flag = ((flag << 16) & 0xff0000) | 0xff00ffff;
} }
flag |= 0xe0e0e0e0;
add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, 0x10000 + move_player, flag); add_process(PROCESSOR_SELECT_PLACE, 0, 0, 0, 0x10000 + move_player, flag);
} }
return FALSE; return FALSE;
......
...@@ -4674,6 +4674,7 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -4674,6 +4674,7 @@ int32 field::refresh_location_info(uint16 step) {
flag = ((flag << 8) & 0xff00) | 0xffff00ff; flag = ((flag << 8) & 0xff00) | 0xffff00ff;
else else
flag = (flag & 0xff) | 0xffffff00; flag = (flag & 0xff) | 0xffffff00;
flag |= 0xe0e0e0e0;
add_process(PROCESSOR_SELECT_DISFIELD, 0, 0, 0, p + (count1 << 16), flag); add_process(PROCESSOR_SELECT_DISFIELD, 0, 0, 0, p + (count1 << 16), flag);
return FALSE; return FALSE;
} }
...@@ -4725,6 +4726,7 @@ int32 field::refresh_location_info(uint16 step) { ...@@ -4725,6 +4726,7 @@ int32 field::refresh_location_info(uint16 step) {
flag = ((flag << 8) & 0xff00) | 0xffff00ff; flag = ((flag << 8) & 0xff00) | 0xffff00ff;
else else
flag = (flag & 0xff) | 0xffffff00; flag = (flag & 0xff) | 0xffffff00;
flag |= 0xe0e0e0e0;
add_process(PROCESSOR_SELECT_DISFIELD, 0, 0, 0, p + (count1 << 16), flag); add_process(PROCESSOR_SELECT_DISFIELD, 0, 0, 0, p + (count1 << 16), flag);
return FALSE; return FALSE;
} }
......
...@@ -43,10 +43,12 @@ function c16178681.rdcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,10 +43,12 @@ function c16178681.rdcon(e,tp,eg,ep,ev,re,r,rp)
if seq~=6 and seq~=7 then return false end if seq~=6 and seq~=7 then return false end
local tc=Duel.GetAttacker() local tc=Duel.GetAttacker()
if tc:IsControler(1-tp) then tc=Duel.GetAttackTarget() end if tc:IsControler(1-tp) then tc=Duel.GetAttackTarget() end
return ep==tp and tc and tc:IsType(TYPE_PENDULUM) and Duel.SelectYesNo(tp,aux.Stringid(16178681,2)) return ep==tp and tc and tc:IsType(TYPE_PENDULUM)
end end
function c16178681.rdop(e,tp,eg,ep,ev,re,r,rp) function c16178681.rdop(e,tp,eg,ep,ev,re,r,rp)
Duel.ChangeBattleDamage(tp,0) if Duel.SelectYesNo(tp,aux.Stringid(16178681,2)) then
Duel.ChangeBattleDamage(tp,0)
end
end end
function c16178681.thcon(e,tp,eg,ep,ev,re,r,rp) function c16178681.thcon(e,tp,eg,ep,ev,re,r,rp)
local seq=e:GetHandler():GetSequence() local seq=e:GetHandler():GetSequence()
......
--E-HERO マリシャス·エッジ --E-HERO マリシャス·エッジ
function c58554959.initial_effect(c) function c58554959.initial_effect(c)
--summon with 1 tribute --decrease tribute
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(58554959,0))
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SUMMON_PROC) e1:SetCode(EFFECT_DECREASE_TRIBUTE)
e1:SetCondition(c58554959.otcon) e1:SetValue(0x1)
e1:SetOperation(c58554959.otop) e1:SetCondition(c58554959.deccon)
e1:SetValue(SUMMON_TYPE_ADVANCE)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--pierce --pierce
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
...@@ -16,14 +13,6 @@ function c58554959.initial_effect(c) ...@@ -16,14 +13,6 @@ function c58554959.initial_effect(c)
e2:SetCode(EFFECT_PIERCE) e2:SetCode(EFFECT_PIERCE)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c58554959.otcon(e,c) function c58554959.deccon(e)
if c==nil then return true end return Duel.GetFieldGroupCount(e:GetHandlerPlayer(),0,LOCATION_MZONE)~=0
return c:GetLevel()>6 and Duel.GetFieldGroupCount(c:GetControler(),0,LOCATION_MZONE)~=0 and Duel.GetTributeCount(c)>0
end
function c58554959.otop(e,tp,eg,ep,ev,re,r,rp,c)
local g=Duel.GetTributeGroup(c)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
local sg=g:Select(tp,1,1,nil)
c:SetMaterial(sg)
Duel.Release(sg, REASON_SUMMON+REASON_MATERIAL)
end end
...@@ -17,7 +17,7 @@ function c61258740.initial_effect(c) ...@@ -17,7 +17,7 @@ function c61258740.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c61258740.indval(e,re,tp) function c61258740.indval(e,re,tp)
return e:GetHandler():GetControler()~=tp return e:GetHandlerPlayer()==1-tp
end end
function c61258740.target(e,tp,eg,ep,ev,re,r,rp,chk) function c61258740.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
......
...@@ -8,6 +8,7 @@ function c73445448.initial_effect(c) ...@@ -8,6 +8,7 @@ function c73445448.initial_effect(c)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SPSUMMON_CONDITION) e1:SetCode(EFFECT_SPSUMMON_CONDITION)
e1:SetValue(c73445448.splimit)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--negate --negate
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
...@@ -25,6 +26,9 @@ function c73445448.initial_effect(c) ...@@ -25,6 +26,9 @@ function c73445448.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
c73445448.xyz_number=22 c73445448.xyz_number=22
function c73445448.splimit(e,se,sp,st)
return bit.band(st,SUMMON_TYPE_XYZ)==SUMMON_TYPE_XYZ
end
function c73445448.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c73445448.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)
and Duel.IsExistingMatchingCard(Card.IsAbleToGraveAsCost,tp,LOCATION_HAND,0,1,nil) end and Duel.IsExistingMatchingCard(Card.IsAbleToGraveAsCost,tp,LOCATION_HAND,0,1,nil) end
......
...@@ -39,7 +39,7 @@ function c81913510.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,7 +39,7 @@ function c81913510.activate(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
local code=e:GetLabel() local code=e:GetLabel()
local tc=Duel.GetFirstMatchingCard(c81913510.filter2,tp,LOCATION_EXTRA,0,nil,code,e,tp) local tc=Duel.GetFirstMatchingCard(c81913510.filter2,tp,LOCATION_EXTRA,0,nil,code,e,tp)
if tc and Duel.SpecialSummon(tc,0,tp,tp,true,false,POS_FACEUP) then if tc and Duel.SpecialSummon(tc,0,tp,tp,true,false,POS_FACEUP)~=0 then
tc:CompleteProcedure() tc:CompleteProcedure()
end end
end end
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