Skip to content

Y
ygopro
Commit d657ce1e authored by DailyShana's avatar DailyShana
Browse files
Options

fix

parent 71f27d1c
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 12 deletions
ocgcore/card.cpp
View file @ d657ce1e
...@@ -1023,7 +1023,7 @@ int32 card::add_effect(effect* peffect) { ...@@ -1023,7 +1023,7 @@ int32 card::add_effect(effect* peffect) {
remove_effect(rm->second); remove_effect(rm->second);
} }
} }
if(peffect->code == EFFECT_SET_DEFENCE && !(peffect->flag & EFFECT_FLAG_SINGLE_RANGE)) { if((peffect->code == EFFECT_SET_DEFENCE || peffect->code == EFFECT_SET_BASE_DEFENCE) && !(peffect->flag & EFFECT_FLAG_SINGLE_RANGE)) {
for(it = single_effect.begin(); it != single_effect.end();) { for(it = single_effect.begin(); it != single_effect.end();) {
rm = it++; rm = it++;
if((rm->second->code == EFFECT_SET_DEFENCE || rm->second->code == EFFECT_SET_DEFENCE_FINAL) if((rm->second->code == EFFECT_SET_DEFENCE || rm->second->code == EFFECT_SET_DEFENCE_FINAL)
......
script/c23303072.lua
View file @ d657ce1e
...@@ -40,8 +40,6 @@ function c23303072.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -40,8 +40,6 @@ function c23303072.spop(e,tp,eg,ep,ev,re,r,rp,c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK) e1:SetCode(EFFECT_SET_ATTACK)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e1:SetRange(LOCATION_MZONE)
e1:SetValue(sum*300) e1:SetValue(sum*300)
e1:SetReset(RESET_EVENT+0xff0000) e1:SetReset(RESET_EVENT+0xff0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
script/c47942531.lua
View file @ d657ce1e
...@@ -19,14 +19,11 @@ function c47942531.valcheck(e,c) ...@@ -19,14 +19,11 @@ function c47942531.valcheck(e,c)
local atk=0 local atk=0
if tc then atk=tc:GetTextAttack()*2 end if tc then atk=tc:GetTextAttack()*2 end
if atk<0 then atk=0 end if atk<0 then atk=0 end
--atk continuous effect
if e:GetLabel()==1 then if e:GetLabel()==1 then
e:SetLabel(0) e:SetLabel(0)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK) e1:SetCode(EFFECT_SET_ATTACK)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e1:SetRange(LOCATION_MZONE)
e1:SetValue(atk) e1:SetValue(atk)
e1:SetReset(RESET_EVENT+0xff0000) e1:SetReset(RESET_EVENT+0xff0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
script/c6614221.lua
View file @ d657ce1e
...@@ -42,8 +42,6 @@ function c6614221.valcheck(e,c) ...@@ -42,8 +42,6 @@ function c6614221.valcheck(e,c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK) e1:SetCode(EFFECT_SET_ATTACK)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e1:SetRange(LOCATION_MZONE)
e1:SetValue(atk) e1:SetValue(atk)
e1:SetReset(RESET_EVENT+0xff0000) e1:SetReset(RESET_EVENT+0xff0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
script/c74506079.lua
View file @ d657ce1e
...@@ -47,7 +47,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local ae=Effect.CreateEffect(c) local ae=Effect.CreateEffect(c)
ae:SetType(EFFECT_TYPE_SINGLE) ae:SetType(EFFECT_TYPE_SINGLE)
ae:SetCode(EFFECT_UPDATE_ATTACK) ae:SetCode(EFFECT_SET_ATTACK)
ae:SetValue(ct*500) ae:SetValue(ct*500)
ae:SetReset(RESET_EVENT+0x1ff0000) ae:SetReset(RESET_EVENT+0x1ff0000)
c:RegisterEffect(ae) c:RegisterEffect(ae)
......
script/c8794435.lua
View file @ d657ce1e
...@@ -25,12 +25,9 @@ function c8794435.valcheck(e,c) ...@@ -25,12 +25,9 @@ function c8794435.valcheck(e,c)
end end
if e:GetLabel()==1 then if e:GetLabel()==1 then
e:SetLabel(0) e:SetLabel(0)
--atk continuous effect
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK) e1:SetCode(EFFECT_SET_ATTACK)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e1:SetRange(LOCATION_MZONE)
e1:SetValue(atk) e1:SetValue(atk)
e1:SetReset(RESET_EVENT+0xff0000) e1:SetReset(RESET_EVENT+0xff0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
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