Skip to content

Y
ygopro
Commit 12a96645 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent 006f3319
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 57 deletions
ocgcore/effect.cpp
View file @ 12a96645
......@@ -350,8 +350,7 @@ int32 effect::is_activate_check(uint8 playerid, const tevent& e, int32 neglect_c
uint8 op = pduel->game_field->core.reason_player;
pduel->game_field->core.reason_effect = this;
pduel->game_field->core.reason_player = playerid;
int32 result = TRUE;
result = is_activate_ready(playerid, e, neglect_cond, neglect_cost, neglect_target);
int32 result = is_activate_ready(playerid, e, neglect_cond, neglect_cost, neglect_target);
pduel->game_field->core.reason_effect = oreason;
pduel->game_field->core.reason_player = op;
pduel->game_field->restore_lp_cost();
......
ocgcore/field.cpp
View file @ 12a96645
......@@ -472,11 +472,10 @@ int32 field::get_useable_count(uint8 playerid, uint8 location, uint8 uplayer, ui
if(list)
*list = flag;
if(eset.count) {
int32 max = 5;
pduel->lua->add_param(playerid, PARAM_TYPE_INT);
pduel->lua->add_param(uplayer, PARAM_TYPE_INT);
pduel->lua->add_param(reason, PARAM_TYPE_INT);
max = eset.get_last()->get_value(3);
int32 max = eset.get_last()->get_value(3);
int32 block = 5 - field_used_count[flag];
int32 limit = max - field_used_count[used_flag];
return block < limit ? block : limit;
......
ocgcore/processor.cpp
View file @ 12a96645
......@@ -4024,7 +4024,6 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
core.flipsummon_state_count[p] = 0;
core.spsummon_state_count[p] = 0;
core.spsummon_state_count_rst[p] = 0;
core.spsummon_rst = false;
core.attack_state_count[p] = 0;
core.battle_phase_count[p] = 0;
core.summon_count[p] = 0;
......@@ -4032,6 +4031,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
core.spsummon_once_map[p].clear();
core.spsummon_once_map_rst[p].clear();
}
core.spsummon_rst = false;
for(auto rit = effects.rechargeable.begin(); rit != effects.rechargeable.end(); ++rit)
if(!((*rit)->flag & EFFECT_FLAG_NO_TURN_RESET))
(*rit)->recharge();
......@@ -4051,7 +4051,7 @@ int32 field::process_turn(uint16 step, uint8 turn_player) {
for(auto iter = effects.spsummon_count_eff.begin(); iter != effects.spsummon_count_eff.end(); ++iter) {
effect* peffect = *iter;
card* pcard = peffect->handler;
if(!(peffect->flag & EFFECT_FLAG_NO_TURN_RESET)){
if(!(peffect->flag & EFFECT_FLAG_NO_TURN_RESET)) {
pcard->spsummon_counter[0] = pcard->spsummon_counter[1] = 0;
pcard->spsummon_counter_rst[0] = pcard->spsummon_counter_rst[1] = 0;
}
......@@ -4448,22 +4448,25 @@ int32 field::add_chain(uint16 step) {
auto& optarget = clit.opinfos[0x200];
if(optarget.op_cards) {
if(optarget.op_player == PLAYER_ALL) {
auto spcard = optarget.op_cards->container.begin();
uint32 plr = optarget.op_param;
if((*spcard)->spsummon_code) {
core.spsummon_once_map[plr][(*spcard)->spsummon_code]++;
core.spsummon_once_map_rst[plr][(*spcard)->spsummon_code]++;
auto opit = optarget.op_cards->container.begin();
uint32 sumplayer = optarget.op_param;
if((*opit)->spsummon_code) {
core.spsummon_once_map[sumplayer][(*opit)->spsummon_code]++;
core.spsummon_once_map_rst[sumplayer][(*opit)->spsummon_code]++;
}
++spcard;
if((*spcard)->spsummon_code) {
core.spsummon_once_map[1 - plr][(*spcard)->spsummon_code]++;
core.spsummon_once_map_rst[1 - plr][(*spcard)->spsummon_code]++;
++opit;
if((*opit)->spsummon_code) {
core.spsummon_once_map[1 - sumplayer][(*opit)->spsummon_code]++;
core.spsummon_once_map_rst[1 - sumplayer][(*opit)->spsummon_code]++;
}
} else {
for(auto spcard = optarget.op_cards->container.begin(); spcard != optarget.op_cards->container.end(); ++spcard) {
if((*spcard)->spsummon_code) {
core.spsummon_once_map[clit.triggering_player][(*spcard)->spsummon_code]++;
core.spsummon_once_map_rst[clit.triggering_player][(*spcard)->spsummon_code]++;
uint32 sumplayer = clit.triggering_player;
if(optarget.op_player == 1)
sumplayer = 1 - sumplayer;
for(auto opit = optarget.op_cards->container.begin(); opit != optarget.op_cards->container.end(); ++opit) {
if((*opit)->spsummon_code) {
core.spsummon_once_map[sumplayer][(*opit)->spsummon_code]++;
core.spsummon_once_map_rst[sumplayer][(*opit)->spsummon_code]++;
}
}
}
......@@ -4582,7 +4585,7 @@ int32 field::solve_chain(uint16 step, uint32 skip_new) {
if(core.spsummon_rst) {
set_spsummon_counter(0, false, true);
set_spsummon_counter(1, false, true);
for(int plr = 0; plr <= 1; ++plr) {
for(int plr = 0; plr < 2; ++plr) {
for(auto iter = core.spsummon_once_map[plr].begin(); iter != core.spsummon_once_map[plr].end(); ++iter) {
auto spcode = iter->first;
core.spsummon_once_map[plr][spcode] -= core.spsummon_once_map_rst[plr][spcode];
......@@ -4621,10 +4624,10 @@ int32 field::solve_chain(uint16 step, uint32 skip_new) {
if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && (peffect->flag & EFFECT_FLAG_CARD_TARGET)) {
auto& optarget = cait->opinfos[0x200];
if(optarget.op_cards) {
for(auto spcard = optarget.op_cards->container.begin(); spcard != optarget.op_cards->container.end(); ++spcard) {
if((*spcard)->spsummon_code) {
for(auto opit = optarget.op_cards->container.begin(); opit != optarget.op_cards->container.end(); ++opit) {
if((*opit)->spsummon_code) {
uint8 sumpl = optarget.op_player ? 1 : 0;
core.spsummon_once_map[sumpl][(*spcard)->spsummon_code]--;
core.spsummon_once_map[sumpl][(*opit)->spsummon_code]--;
}
}
}
......@@ -4692,10 +4695,10 @@ int32 field::solve_chain(uint16 step, uint32 skip_new) {
if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && (peffect->flag & EFFECT_FLAG_CARD_TARGET)) {
auto& optarget = cait->opinfos[0x200];
if(optarget.op_cards) {
for(auto spcard = optarget.op_cards->container.begin(); spcard!= optarget.op_cards->container.end(); ++spcard) {
if((*spcard)->spsummon_code) {
for(auto opit = optarget.op_cards->container.begin(); opit != optarget.op_cards->container.end(); ++opit) {
if((*opit)->spsummon_code) {
uint8 sumpl = optarget.op_player ? 1 : 0;
core.spsummon_once_map[sumpl][(*spcard)->spsummon_code]--;
core.spsummon_once_map[sumpl][(*opit)->spsummon_code]--;
}
}
}
......@@ -4712,7 +4715,7 @@ int32 field::solve_chain(uint16 step, uint32 skip_new) {
return FALSE;
}
case 4: {
if(core.units.begin()->peffect == 0){
if(core.units.begin()->peffect == 0) {
if(cait->opinfos.count(0x200)) {
if(core.spsummon_state_count_tmp[cait->triggering_player] == core.spsummon_state_count[cait->triggering_player])
set_spsummon_counter(cait->triggering_player);
......@@ -4723,22 +4726,27 @@ int32 field::solve_chain(uint16 step, uint32 skip_new) {
auto& optarget = cait->opinfos[0x200];
if(optarget.op_cards) {
if(optarget.op_player == PLAYER_ALL) {
auto spcard = optarget.op_cards->container.begin();
uint32 plr = optarget.op_param;
if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && (*spcard)->spsummon_code) {
core.spsummon_once_map[plr][(*spcard)->spsummon_code]++;
++spcard;
core.spsummon_once_map[1 - plr][(*spcard)->spsummon_code]++;
}
spcard = optarget.op_cards->container.begin();
check_card_counter(*spcard, 3, plr);
++spcard;
check_card_counter(*spcard, 3, 1 - plr);
uint32 sumplayer = optarget.op_param;
if(core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) {
auto opit = optarget.op_cards->container.begin();
if((*opit)->spsummon_code)
core.spsummon_once_map[sumplayer][(*opit)->spsummon_code]++;
++opit;
if((*opit)->spsummon_code)
core.spsummon_once_map[1 - sumplayer][(*opit)->spsummon_code]++;
}
auto opit = optarget.op_cards->container.begin();
check_card_counter(*opit, 3, sumplayer);
++opit;
check_card_counter(*opit, 3, 1 - sumplayer);
} else {
for(auto spcard = optarget.op_cards->container.begin(); spcard != optarget.op_cards->container.end(); ++spcard) {
if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && (*spcard)->spsummon_code)
core.spsummon_once_map[cait->triggering_player][(*spcard)->spsummon_code]++;
check_card_counter(*spcard, 3, cait->triggering_player);
uint32 sumplayer = cait.triggering_player;
if(optarget.op_player == 1)
sumplayer = 1 - sumplayer;
for(auto opit = optarget.op_cards->container.begin(); opit != optarget.op_cards->container.end(); ++opit) {
if((core.global_flag & GLOBALFLAG_SPSUMMON_ONCE) && (*opit)->spsummon_code)
core.spsummon_once_map[sumplayer][(*opit)->spsummon_code]++;
check_card_counter(*opit, 3, sumplayer);
}
}
}
......
script/c12525049.lua
View file @ 12a96645
......@@ -42,6 +42,7 @@ function c12525049.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
end
function c12525049.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
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,c12525049.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
......
script/c23516703.lua
View file @ 12a96645
......@@ -15,7 +15,7 @@ function c23516703.initial_effect(c)
e2:SetTarget(c23516703.limittg)
c:RegisterEffect(e2)
local e3=e2:Clone()
e3:SetCode(EFFECT_CANNOT_FLIPSUMMON)
e3:SetCode(EFFECT_CANNOT_FLIP_SUMMON)
c:RegisterEffect(e3)
local e4=e2:Clone()
e4:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
......
script/c55067058.lua
View file @ 12a96645
......@@ -17,7 +17,7 @@ end
c55067058.xyz_number=19
function c55067058.rcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_COST)~=0 and re:IsHasType(0x7e0) and re:IsActiveType(TYPE_XYZ)
and e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_EFFECT)
and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_EFFECT)
and ep==e:GetOwnerPlayer() and re:GetHandler():GetOverlayCount()>=ev-1
end
function c55067058.rop(e,tp,eg,ep,ev,re,r,rp)
......
script/c57728570.lua
View file @ 12a96645
......@@ -20,25 +20,23 @@ function c57728570.cost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Release(g,REASON_COST)
end
function c57728570.filter(c)
return c:IsType(TYPE_MONSTER) and c:IsAttackAbove(1500) and c:IsDestructable()
return c:IsAttackAbove(1500) and c:IsDestructable()
end
function c57728570.hgfilter(c)
return not c:IsPublic() or c57728570.filter(c)
end
function c57728570.fgfilter(c)
return not c:IsFaceup() or c57728570.filter(c)
return c:IsFacedown() or c57728570.filter(c)
end
function c57728570.tgfilter(c)
return ((c:IsLocation(LOCATION_HAND) and c:IsPublic()) or (c:IsLocation(LOCATION_HAND) and c:IsFaceup())) and c57728570.filter(c)
return ((c:IsLocation(LOCATION_HAND) and c:IsPublic()) or (c:IsLocation(LOCATION_MZONE) and c:IsFaceup())) and c57728570.filter(c)
end
function c57728570.target(e,tp,eg,ep,ev,re,r,rp,chk)
local ct1=Duel.GetFieldGroup(tp,0,LOCATION_HAND):FilterCount(c57728570.hgfilter,nil)
local ct2=Duel.GetFieldGroup(tp,0,LOCATION_MZONE):FilterCount(c57728570.fgfilter,nil)
if chk==0 then return ct1+ct2>0 end
if chk==0 then return Duel.IsExistingMatchingCard(c57728570.hgfilter,tp,0,LOCATION_HAND,1,nil)
or Duel.IsExistingMatchingCard(c57728570.fgfilter,tp,0,LOCATION_MZONE,1,nil) end
local g=Duel.GetMatchingGroup(c57728570.tgfilter,tp,0,LOCATION_MZONE+LOCATION_HAND,nil)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
end
function c57728570.activate(e,tp,eg,ep,ev,re,r,rp)
local conf=Duel.GetFieldGroup(tp,0,LOCATION_MZONE+LOCATION_HAND)
local ct=0
......
script/c58551308.lua
View file @ 12a96645
......@@ -33,8 +33,14 @@ function c58551308.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local g1=Duel.SelectTarget(tp,c58551308.filter,tp,LOCATION_GRAVE,0,1,1,e:GetHandler(),e,tp)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_SPSUMMON)
local g2=Duel.SelectTarget(1-tp,c58551308.filter,1-tp,LOCATION_GRAVE,0,1,1,e:GetHandler(),e,1-tp)
if g1:GetCount()>0 and g2:GetCount()>0 then
g1:Merge(g2)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g1,g1:GetCount(),PLAYER_ALL,g1:GetFirst():GetOwner())
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g1,2,PLAYER_ALL,g1:GetFirst():GetOwner())
elseif g1:GetCount()>0 then
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g1,1,0,0)
elseif g2:GetCount()>0 then
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g2,1,1,0)
end
end
function c58551308.spop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
......
script/c74892653.lua
View file @ 12a96645
......@@ -50,7 +50,7 @@ function c74892653.target(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_DISABLE_SUMMON,eg,eg:GetCount(),0,0)
Duel.SetOperationInfo(0,CATEGORY_DESTROY,eg,eg:GetCount(),0,0)
end
function c74892653.operation(e,tp,eg,ep,ev,re,r,rp,chk)
function c74892653.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateSummon(eg)
Duel.Destroy(eg,REASON_EFFECT)
e:GetHandler():RegisterFlagEffect(74892653,RESET_EVENT+0x1fe0000+RESET_PHASE+RESET_END,0,1)
......@@ -72,7 +72,8 @@ function c74892653.sccon(e,tp,eg,ep,ev,re,r,rp)
and c:IsPreviousPosition(POS_FACEUP)
end
function c74892653.filter(c,e,tp)
return c:IsSetCard(0x66) and c:IsLevelBelow(8) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_SYNCHRO,tp,false,false)
return c:IsSetCard(0x66) and c:IsLevelBelow(8) and c:IsType(TYPE_SYNCHRO)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_SYNCHRO,tp,false,false)
end
function c74892653.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
script/c86466163.lua
View file @ 12a96645
......@@ -23,7 +23,7 @@ function c86466163.operation(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_XYZ_LEVEL)
e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e1:SetTargetRange(LOCATION_MZONE,0)
e1:SetTargeet(c86466163.xyztg)
e1:SetTarget(c86466163.xyztg)
e1:SetValue(c86466163.xyzlv)
e1:SetReset(RESET_PHASE+RESET_END)
Duel.RegisterEffect(e1,tp)
......
script/c8809344.lua
View file @ 12a96645
......@@ -44,10 +44,9 @@ function c8809344.rkop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c8809344.condition(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsType(TYPE_XYZ) and e:GetOverlayGroup():GetCount()>0
return e:GetHandler():IsType(TYPE_XYZ) and e:GetHandler():GetOverlayCount()>0
end
function c8809344.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler()
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and chkc:IsType(TYPE_MONSTER) end
if chk==0 then return Duel.IsExistingTarget(Card.IsType,tp,LOCATION_GRAVE,0,1,nil,TYPE_MONSTER) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
......
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