Commit e5dcc0fe authored by VanillaSalt's avatar VanillaSalt

fix

parent d631b234
...@@ -1600,7 +1600,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack) ...@@ -1600,7 +1600,7 @@ int32 field::get_attack_target(card* pcard, card_vector* v, uint8 chain_attack)
card_vector::iterator cit; card_vector::iterator cit;
for(uint32 i = 0; i < 5; ++i) { for(uint32 i = 0; i < 5; ++i) {
atarget = player[1 - p].list_mzone[i]; atarget = player[1 - p].list_mzone[i];
if(atarget && atarget->is_affected_by_effect(EFFECT_MUST_BE_ATTACKED)) if(atarget && atarget->is_affected_by_effect(EFFECT_MUST_BE_ATTACKED, pcard))
must_be_attack.push_back(atarget); must_be_attack.push_back(atarget);
} }
if(pcard->attack_all_target && (peffect = pcard->is_affected_by_effect(EFFECT_ATTACK_ALL))) { if(pcard->attack_all_target && (peffect = pcard->is_affected_by_effect(EFFECT_ATTACK_ALL))) {
......
...@@ -37,6 +37,7 @@ function c22200403.initial_effect(c) ...@@ -37,6 +37,7 @@ function c22200403.initial_effect(c)
e5:SetType(EFFECT_TYPE_SINGLE) e5:SetType(EFFECT_TYPE_SINGLE)
e5:SetCode(EFFECT_MUST_BE_ATTACKED) e5:SetCode(EFFECT_MUST_BE_ATTACKED)
e5:SetCondition(c22200403.effcon) e5:SetCondition(c22200403.effcon)
e5:SetValue(1)
e5:SetLabel(3) e5:SetLabel(3)
c:RegisterEffect(e5) c:RegisterEffect(e5)
local e6=Effect.CreateEffect(c) local e6=Effect.CreateEffect(c)
......
...@@ -36,8 +36,7 @@ function c26509612.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -36,8 +36,7 @@ function c26509612.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.RegisterEffect(e2,tp) Duel.RegisterEffect(e2,tp)
local e3=Effect.CreateEffect(e:GetHandler()) local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
e3:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET) e3:SetCode(EFFECT_MUST_BE_ATTACKED)
e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
e3:SetTargetRange(LOCATION_MZONE,0) e3:SetTargetRange(LOCATION_MZONE,0)
e3:SetTarget(c26509612.attg2) e3:SetTarget(c26509612.attg2)
e3:SetValue(c26509612.attg) e3:SetValue(c26509612.attg)
...@@ -48,5 +47,5 @@ function c26509612.attg(e,c) ...@@ -48,5 +47,5 @@ function c26509612.attg(e,c)
return c:IsLevelBelow(4) return c:IsLevelBelow(4)
end end
function c26509612.attg2(e,c) function c26509612.attg2(e,c)
return c:IsFacedown() or not c:IsCode(74711057) return c:IsCode(74711057)
end end
...@@ -22,6 +22,7 @@ function c32543380.initial_effect(c) ...@@ -22,6 +22,7 @@ function c32543380.initial_effect(c)
e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e3:SetCode(EFFECT_MUST_BE_ATTACKED) e3:SetCode(EFFECT_MUST_BE_ATTACKED)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetValue(1)
c:RegisterEffect(e3) c:RegisterEffect(e3)
--special summon --special summon
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
......
...@@ -34,20 +34,10 @@ function c48582558.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -34,20 +34,10 @@ function c48582558.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
local e3=Effect.CreateEffect(e:GetHandler()) local e3=Effect.CreateEffect(e:GetHandler())
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_CANNOT_SELECT_BATTLE_TARGET) e3:SetCode(EFFECT_MUST_BE_ATTACKED)
e3:SetTargetRange(0,LOCATION_MZONE) e3:SetValue(aux.imval1)
e3:SetCondition(c48582558.atkcon) e3:SetReset(RESET_EVENT+0x1fc0000+RESET_PHASE+PHASE_END)
e3:SetValue(c48582558.atlimit) tc:RegisterEffect(e3)
e3:SetReset(RESET_PHASE+PHASE_END)
e3:SetLabelObject(tc)
e3:SetLabel(tc:GetRealFieldID())
Duel.RegisterEffect(e3,tp)
end end
end end
function c48582558.atkcon(e)
return e:GetLabelObject():GetRealFieldID()==e:GetLabel()
end
function c48582558.atlimit(e,c)
return c:GetRealFieldID()~=e:GetLabel()
end
...@@ -32,6 +32,7 @@ function c86676862.initial_effect(c) ...@@ -32,6 +32,7 @@ function c86676862.initial_effect(c)
e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e5:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e5:SetCode(EFFECT_MUST_BE_ATTACKED) e5:SetCode(EFFECT_MUST_BE_ATTACKED)
e5:SetRange(LOCATION_MZONE) e5:SetRange(LOCATION_MZONE)
e5:SetValue(1)
c:RegisterEffect(e5) c:RegisterEffect(e5)
end end
function c86676862.splimit(e,se,sp,st) function c86676862.splimit(e,se,sp,st)
......
...@@ -26,6 +26,7 @@ function c90740329.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -26,6 +26,7 @@ function c90740329.activate(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_MUST_BE_ATTACKED) e1:SetCode(EFFECT_MUST_BE_ATTACKED)
e1:SetValue(1)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
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