Skip to content

Y
ygopro
Commit 365c15ce authored by mercury233's avatar mercury233
Browse files
Options

Merge https://github.com/Fluorohydride/ygopro into server

parents 3286ce2a 3935b2d5
Show whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
ocgcore/card.cpp
View file @ 365c15ce
...@@ -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)
......
ocgcore/operations.cpp
View file @ 365c15ce
...@@ -2773,6 +2773,7 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -2773,6 +2773,7 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3
} }
returns.ivalue[0] = core.operated_set.size(); returns.ivalue[0] = core.operated_set.size();
pduel->delete_group(targets); pduel->delete_group(targets);
adjust_all();
return TRUE; return TRUE;
} }
case 10: { case 10: {
...@@ -3452,7 +3453,6 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -3452,7 +3453,6 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
core.operated_set = targets->container; core.operated_set = targets->container;
returns.ivalue[0] = targets->container.size(); returns.ivalue[0] = targets->container.size();
pduel->delete_group(targets); pduel->delete_group(targets);
adjust_all();
return TRUE; return TRUE;
} }
} }
......
script/c74506079.lua
View file @ 365c15ce
...@@ -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)
......
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