Skip to content

Y
ygopro
Commit 301b712d authored by argon.sun's avatar argon.sun
Browse files
Options

fix

parent da3b627f
Show whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
ocgcore/operations.cpp
View file @ 301b712d
...@@ -1550,7 +1550,6 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui ...@@ -1550,7 +1550,6 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui
} else } else
target->summon_type = SUMMON_TYPE_NORMAL; target->summon_type = SUMMON_TYPE_NORMAL;
target->summon_player = setplayer; target->summon_player = setplayer;
break_effect();
target->current.reason_effect = 0; target->current.reason_effect = 0;
target->current.reason_player = setplayer; target->current.reason_player = setplayer;
core.units.begin()->step = 4; core.units.begin()->step = 4;
...@@ -1567,6 +1566,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui ...@@ -1567,6 +1566,7 @@ int32 field::mset(uint16 step, uint8 setplayer, card * target, effect * proc, ui
} }
case 5: { case 5: {
core.temp_var[0] = 0; core.temp_var[0] = 0;
break_effect();
if(!ignore_count) { if(!ignore_count) {
returns.ivalue[0] = FALSE; returns.ivalue[0] = FALSE;
effect* pextra = core.extra_summon[setplayer] ? 0 : target->is_affected_by_effect(EFFECT_EXTRA_SET_COUNT); effect* pextra = core.extra_summon[setplayer] ? 0 : target->is_affected_by_effect(EFFECT_EXTRA_SET_COUNT);
......
script/c11502550.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c11502550.initial_effect(c) function c11502550.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode2(c,89943723,54959865,true,true) aux.AddFusionProcCode2(c,89943723,54959865,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c17032740.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c17032740.initial_effect(c) function c17032740.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode3(c,89943723,43237273,17732278,true,true) aux.AddFusionProcCode3(c,89943723,43237273,17732278,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c28677304.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c28677304.initial_effect(c) function c28677304.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode2(c,89943723,43237273,true,true) aux.AddFusionProcCode2(c,89943723,43237273,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c35255456.lua
View file @ 301b712d
...@@ -13,7 +13,7 @@ function c35255456.filter1(c,e) ...@@ -13,7 +13,7 @@ function c35255456.filter1(c,e)
return c:IsAbleToDeck() and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e) and not c:IsHasEffect(EFFECT_NECRO_VALLEY) return c:IsAbleToDeck() and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e) and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
end end
function c35255456.filter2(c,e,tp,m,chkf) function c35255456.filter2(c,e,tp,m,chkf)
return c:IsType(TYPE_FUSION) and c:IsSetCard(0x3008) and c:IsSetCard(0x9) and c:GetCode()~=86346643 return c:IsType(TYPE_FUSION) and c:IsSetCard(0x3008) and c:IsSetCard(0x9) and c:GetCode()~=31111109
and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and c:CheckFusionMaterial(m,nil,chkf) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and c:CheckFusionMaterial(m,nil,chkf)
end end
function c35255456.target(e,tp,eg,ep,ev,re,r,rp,chk) function c35255456.target(e,tp,eg,ep,ev,re,r,rp,chk)
......
script/c48996569.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c48996569.initial_effect(c) function c48996569.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode2(c,89943723,80344569,true,true) aux.AddFusionProcCode2(c,89943723,80344569,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c49352945.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c49352945.initial_effect(c) function c49352945.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode3(c,89943723,17955766,54959865,true,true) aux.AddFusionProcCode3(c,89943723,17955766,54959865,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c5128859.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c5128859.initial_effect(c) function c5128859.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode2(c,89943723,78734254,true,true) aux.AddFusionProcCode2(c,89943723,78734254,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c55171412.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c55171412.initial_effect(c) function c55171412.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode2(c,89943723,17955766,true,true) aux.AddFusionProcCode2(c,89943723,17955766,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c78512663.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c78512663.initial_effect(c) function c78512663.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode3(c,89943723,89621922,80344569,true,true) aux.AddFusionProcCode3(c,89943723,89621922,80344569,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c81566151.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c81566151.initial_effect(c) function c81566151.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode2(c,89943723,89621922,true,true) aux.AddFusionProcCode2(c,89943723,89621922,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
script/c85507811.lua
View file @ 301b712d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
function c85507811.initial_effect(c) function c85507811.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcCode2(c,89943723,17732278,true,true) aux.AddFusionProcCode2(c,89943723,17732278,false,false)
--spsummon condition --spsummon condition
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
system.conf
View file @ 301b712d
...@@ -9,5 +9,5 @@ lastdeck = sample ...@@ -9,5 +9,5 @@ lastdeck = sample
textfont = c:/windows/fonts/simsun.ttc 14 textfont = c:/windows/fonts/simsun.ttc 14
numfont = c:/windows/fonts/arialbd.ttf numfont = c:/windows/fonts/arialbd.ttf
serverport = 7911 serverport = 7911
lastip = 192.168.3.235 lastip = 192.168.2.100
lastport = 7911 lastport = 7911
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