Skip to content

Y
ygopro
Commit 89ffc7a5 authored by mercury233's avatar mercury233
Browse files
Options

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

parents 521c3a54 eda6e68b
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 48 deletions
ocgcore/card.cpp
View file @ 89ffc7a5
...@@ -369,7 +369,7 @@ uint32 card::get_type() { ...@@ -369,7 +369,7 @@ uint32 card::get_type() {
int32 card::get_base_attack(uint8 swap) { int32 card::get_base_attack(uint8 swap) {
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.attack; return data.attack;
if (temp.base_attack != -1) if (temp.base_attack != -1)
return temp.base_attack; return temp.base_attack;
...@@ -397,7 +397,7 @@ int32 card::get_attack() { ...@@ -397,7 +397,7 @@ int32 card::get_attack() {
return assume_value; return assume_value;
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.attack; return data.attack;
if (temp.attack != -1) if (temp.attack != -1)
return temp.attack; return temp.attack;
...@@ -408,7 +408,7 @@ int32 card::get_attack() { ...@@ -408,7 +408,7 @@ int32 card::get_attack() {
int32 card::get_base_defence(uint8 swap) { int32 card::get_base_defence(uint8 swap) {
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.defence; return data.defence;
if (temp.base_defence != -1) if (temp.base_defence != -1)
return temp.base_defence; return temp.base_defence;
...@@ -436,7 +436,7 @@ int32 card::get_defence() { ...@@ -436,7 +436,7 @@ int32 card::get_defence() {
return assume_value; return assume_value;
if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER)) if (current.location != LOCATION_MZONE && !(data.type & TYPE_MONSTER) && !(get_type() & TYPE_MONSTER))
return 0; return 0;
if (current.location != LOCATION_MZONE) if (current.location != LOCATION_MZONE || status & STATUS_SUMMONING)
return data.defence; return data.defence;
if (temp.defence != -1) if (temp.defence != -1)
return temp.defence; return temp.defence;
......
ocgcore/operations.cpp
View file @ 89ffc7a5
...@@ -2773,7 +2773,6 @@ int32 field::destroy(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -2773,7 +2773,6 @@ 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: {
......
ocgcore/processor.cpp
View file @ 89ffc7a5
...@@ -3559,6 +3559,7 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3559,6 +3559,7 @@ int32 field::process_battle_command(uint16 step) {
} }
add_process(PROCESSOR_DESTROY, 3, 0, des, REASON_BATTLE, PLAYER_NONE); add_process(PROCESSOR_DESTROY, 3, 0, des, REASON_BATTLE, PLAYER_NONE);
} }
adjust_all();
return FALSE; return FALSE;
} }
case 33: { case 33: {
......
script/c23303072.lua
View file @ 89ffc7a5
...@@ -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 @ 89ffc7a5
...@@ -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/c57734012.lua
View file @ 89ffc7a5
...@@ -44,7 +44,7 @@ function c57734012.filter1(c,e,tp) ...@@ -44,7 +44,7 @@ function c57734012.filter1(c,e,tp)
if not m then return false end if not m then return false end
local no=m.xyz_number local no=m.xyz_number
return no and no>=101 and no<=107 and c:IsSetCard(0x48) and not c:IsSetCard(0x1048) return no and no>=101 and no<=107 and c:IsSetCard(0x48) and not c:IsSetCard(0x1048)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsHasEffect(EFFECT_NECRO_VALLEY) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
and Duel.IsExistingMatchingCard(c57734012.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,no) and Duel.IsExistingMatchingCard(c57734012.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,c,no)
end end
function c57734012.filter2(c,e,tp,mc,no) function c57734012.filter2(c,e,tp,mc,no)
...@@ -64,7 +64,7 @@ function c57734012.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,7 +64,7 @@ function c57734012.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g1=Duel.SelectMatchingCard(tp,c57734012.filter1,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil,e,tp) local g1=Duel.SelectMatchingCard(tp,c57734012.filter1,tp,LOCATION_GRAVE+LOCATION_EXTRA,0,1,1,nil,e,tp)
local tc1=g1:GetFirst() local tc1=g1:GetFirst()
if tc1 and Duel.SpecialSummon(tc1,0,tp,tp,false,false,POS_FACEUP)~=0 then if tc1 and not tc1:IsHasEffect(EFFECT_NECRO_VALLEY) and Duel.SpecialSummon(tc1,0,tp,tp,false,false,POS_FACEUP)~=0 then
local m=_G["c"..tc1:GetCode()] local m=_G["c"..tc1:GetCode()]
if not m then return end if not m then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
......
script/c6614221.lua
View file @ 89ffc7a5
...@@ -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/c67273917.lua
View file @ 89ffc7a5
...@@ -24,7 +24,6 @@ function c67273917.thcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -24,7 +24,6 @@ function c67273917.thcon(e,tp,eg,ep,ev,re,r,rp)
end end
function c67273917.filter(c) function c67273917.filter(c)
return c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsAbleToHand() return c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsAbleToHand()
and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
end end
function c67273917.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c67273917.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -44,7 +43,7 @@ function c67273917.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -44,7 +43,7 @@ function c67273917.thop(e,tp,eg,ep,ev,re,r,rp)
if Duel.Destroy(dg,REASON_EFFECT)~=2 then return end if Duel.Destroy(dg,REASON_EFFECT)~=2 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c67273917.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c67273917.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 and not g:GetFirst():IsHasEffect(EFFECT_NECRO_VALLEY) then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
......
script/c71921856.lua
View file @ 89ffc7a5
...@@ -33,7 +33,7 @@ function c71921856.initial_effect(c) ...@@ -33,7 +33,7 @@ function c71921856.initial_effect(c)
end end
c71921856.xyz_number=79 c71921856.xyz_number=79
function c71921856.filter(c) function c71921856.filter(c)
return c:IsSetCard(0x84) and c:IsType(TYPE_MONSTER) and not c:IsHasEffect(EFFECT_NECRO_VALLEY) return c:IsSetCard(0x84) and c:IsType(TYPE_MONSTER)
end end
function c71921856.target(e,tp,eg,ep,ev,re,r,rp,chk) function c71921856.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c71921856.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c71921856.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil) end
...@@ -43,7 +43,7 @@ function c71921856.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,7 +43,7 @@ function c71921856.operation(e,tp,eg,ep,ev,re,r,rp)
if not c:IsRelateToEffect(e) then return end if not c:IsRelateToEffect(e) then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,c71921856.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c71921856.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 and not g:GetFirst():IsHasEffect(EFFECT_NECRO_VALLEY) then
Duel.Overlay(c,g) Duel.Overlay(c,g)
end end
end end
......
script/c74506079.lua
View file @ 89ffc7a5
...@@ -15,13 +15,6 @@ function c74506079.initial_effect(c) ...@@ -15,13 +15,6 @@ function c74506079.initial_effect(c)
e2:SetCode(EFFECT_MATERIAL_CHECK) e2:SetCode(EFFECT_MATERIAL_CHECK)
e2:SetValue(c74506079.matcheck) e2:SetValue(c74506079.matcheck)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_SINGLE)
e3:SetCode(EVENT_SPSUMMON_SUCCESS)
e3:SetCondition(c74506079.regcon)
e3:SetOperation(c74506079.regop)
e3:SetLabelObject(e2)
c:RegisterEffect(e3)
end end
function c74506079.ffilter(c) function c74506079.ffilter(c)
return c:IsSetCard(0x3e) and c:IsRace(RACE_REPTILE) return c:IsSetCard(0x3e) and c:IsRace(RACE_REPTILE)
...@@ -36,21 +29,15 @@ function c74506079.fsoperation(e,tp,eg,ep,ev,re,r,rp,gc) ...@@ -36,21 +29,15 @@ function c74506079.fsoperation(e,tp,eg,ep,ev,re,r,rp,gc)
Duel.SetFusionMaterial(eg:FilterSelect(tp,c74506079.ffilter,2,63,nil)) Duel.SetFusionMaterial(eg:FilterSelect(tp,c74506079.ffilter,2,63,nil))
end end
function c74506079.matcheck(e,c) function c74506079.matcheck(e,c)
local g=c:GetMaterial() local ct=c:GetMaterial():GetClassCount(Card.GetCode)
e:SetLabel(g:GetClassCount(Card.GetCode)) if ct>0 then
end local ae=Effect.CreateEffect(c)
function c74506079.regcon(e,tp,eg,ep,ev,re,r,rp) ae:SetType(EFFECT_TYPE_SINGLE)
return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION ae:SetCode(EFFECT_SET_ATTACK)
end ae:SetValue(ct*500)
function c74506079.regop(e,tp,eg,ep,ev,re,r,rp) ae:SetReset(RESET_EVENT+0xff0000)
local ct=e:GetLabelObject():GetLabel() c:RegisterEffect(ae)
local c=e:GetHandler() end
local ae=Effect.CreateEffect(c)
ae:SetType(EFFECT_TYPE_SINGLE)
ae:SetCode(EFFECT_SET_ATTACK)
ae:SetValue(ct*500)
ae:SetReset(RESET_EVENT+0x1ff0000)
c:RegisterEffect(ae)
if ct>=2 then if ct>=2 then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(74506079,0)) e1:SetDescription(aux.Stringid(74506079,0))
...@@ -61,7 +48,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +48,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetTarget(c74506079.sptg) e1:SetTarget(c74506079.sptg)
e1:SetOperation(c74506079.spop) e1:SetOperation(c74506079.spop)
e1:SetReset(RESET_EVENT+0x1fe0000) e1:SetReset(RESET_EVENT+0xfe0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
if ct>=4 then if ct>=4 then
...@@ -74,7 +61,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -74,7 +61,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCost(c74506079.tgcost) e1:SetCost(c74506079.tgcost)
e1:SetTarget(c74506079.tgtg) e1:SetTarget(c74506079.tgtg)
e1:SetOperation(c74506079.tgop) e1:SetOperation(c74506079.tgop)
e1:SetReset(RESET_EVENT+0x1fe0000) e1:SetReset(RESET_EVENT+0xfe0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
if ct>=6 then if ct>=6 then
...@@ -87,7 +74,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp) ...@@ -87,7 +74,7 @@ function c74506079.regop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetTarget(c74506079.drtg) e1:SetTarget(c74506079.drtg)
e1:SetOperation(c74506079.drop) e1:SetOperation(c74506079.drop)
e1:SetReset(RESET_EVENT+0x1fe0000) e1:SetReset(RESET_EVENT+0xfe0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
end end
......
script/c8794435.lua
View file @ 89ffc7a5
...@@ -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)
......
script/c93662626.lua
View file @ 89ffc7a5
...@@ -24,7 +24,6 @@ function c93662626.thcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -24,7 +24,6 @@ function c93662626.thcon(e,tp,eg,ep,ev,re,r,rp)
end end
function c93662626.filter(c) function c93662626.filter(c)
return c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsAbleToHand() return c:IsRace(RACE_WARRIOR) and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsAbleToHand()
and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
end end
function c93662626.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c93662626.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -44,7 +43,7 @@ function c93662626.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -44,7 +43,7 @@ function c93662626.thop(e,tp,eg,ep,ev,re,r,rp)
if Duel.Destroy(dg,REASON_EFFECT)~=2 then return end if Duel.Destroy(dg,REASON_EFFECT)~=2 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c93662626.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c93662626.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 and not g:GetFirst():IsHasEffect(EFFECT_NECRO_VALLEY) then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
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