Skip to content

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

update

parent 30d61a92
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 85 deletions
gframe/game.cpp
View file @ ac298479
......@@ -14,7 +14,7 @@
#include <dirent.h>
#endif
const unsigned short PRO_VERSION = 0x1330;
const unsigned short PRO_VERSION = 0x1331;
namespace ygo {
......
ocgcore/effect.cpp
View file @ ac298479
......@@ -585,6 +585,6 @@ int32 effect::in_range(int32 loc, int32 seq) {
if(seq < 5)
return range & LOCATION_SZONE;
if(seq == 5)
return range & LOCATION_FZONE;
return range & (LOCATION_SZONE | LOCATION_FZONE);
return range & LOCATION_PZONE;
}
script/c13760677.lua
View file @ ac298479
......@@ -12,7 +12,7 @@ function c13760677.initial_effect(c)
e2:SetDescription(aux.Stringid(13760677,0))
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_SPSUMMON_SUCCESS)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetCondition(c13760677.indcon)
e2:SetTarget(c13760677.indtg)
e2:SetOperation(c13760677.indop)
......@@ -34,8 +34,7 @@ function c13760677.cfilter(c,e,tp)
and (not e or c:IsRelateToEffect(e))
end
function c13760677.indcon(e,tp,eg,ep,ev,re,r,rp)
return (e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7)
and eg:IsExists(c13760677.cfilter,1,nil,nil,tp)
return eg:IsExists(c13760677.cfilter,1,nil,nil,tp)
end
function c13760677.indtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end
......
script/c16178681.lua
View file @ ac298479
......@@ -12,7 +12,7 @@ function c16178681.initial_effect(c)
e2:SetDescription(aux.Stringid(16178681,0))
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetCode(EVENT_PRE_BATTLE_DAMAGE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetCountLimit(1,16178681)
e2:SetCondition(c16178681.rdcon)
e2:SetOperation(c16178681.rdop)
......@@ -24,7 +24,7 @@ function c16178681.initial_effect(c)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetCode(EVENT_PHASE+PHASE_END)
e3:SetProperty(EFFECT_FLAG_REPEAT)
e3:SetRange(LOCATION_SZONE)
e3:SetRange(LOCATION_PZONE)
e3:SetCountLimit(1,16178682)
e3:SetCondition(c16178681.thcon)
e3:SetTarget(c16178681.thtg)
......@@ -39,8 +39,6 @@ function c16178681.initial_effect(c)
c:RegisterEffect(e4)
end
function c16178681.rdcon(e,tp,eg,ep,ev,re,r,rp)
local seq=e:GetHandler():GetSequence()
if seq~=6 and seq~=7 then return false end
local tc=Duel.GetAttacker()
if tc:IsControler(1-tp) then tc=Duel.GetAttackTarget() end
return ep==tp and tc and tc:IsType(TYPE_PENDULUM)
......@@ -51,8 +49,6 @@ function c16178681.rdop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c16178681.thcon(e,tp,eg,ep,ev,re,r,rp)
local seq=e:GetHandler():GetSequence()
if seq~=6 and seq~=7 then return false end
return Duel.GetTurnPlayer()==tp
end
function c16178681.filter(c)
......
script/c17857780.lua
View file @ ac298479
......@@ -11,9 +11,8 @@ function c17857780.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_UPDATE_ATTACK)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(LOCATION_MZONE,0)
e2:SetCondition(c17857780.atkcon)
e2:SetTarget(c17857780.atktg)
e2:SetValue(300)
c:RegisterEffect(e2)
......@@ -29,9 +28,6 @@ function c17857780.initial_effect(c)
e3:SetOperation(c17857780.operation)
c:RegisterEffect(e3)
end
function c17857780.atkcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c17857780.atktg(e,c)
return c:IsType(TYPE_PENDULUM)
end
......
script/c20409757.lua
View file @ ac298479
......@@ -12,7 +12,7 @@ function c20409757.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetCode(EVENT_ATTACK_ANNOUNCE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetCondition(c20409757.actcon)
e2:SetOperation(c20409757.actop)
c:RegisterEffect(e2)
......@@ -24,7 +24,7 @@ function c20409757.initial_effect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_CHANGE_LSCALE)
e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e4:SetRange(LOCATION_SZONE)
e4:SetRange(LOCATION_PZONE)
e4:SetCondition(c20409757.slcon)
e4:SetValue(4)
c:RegisterEffect(e4)
......@@ -48,8 +48,7 @@ end
function c20409757.actcon(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetAttacker()
if tc:IsControler(1-tp) then tc=Duel.GetAttackTarget() end
return (e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7)
and tc and tc:IsControler(tp) and tc:IsType(TYPE_PENDULUM)
return tc and tc:IsControler(tp) and tc:IsType(TYPE_PENDULUM)
end
function c20409757.actop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler())
......@@ -66,7 +65,6 @@ function c20409757.aclimit(e,re,tp)
end
function c20409757.slcon(e)
local seq=e:GetHandler():GetSequence()
if seq~=6 and seq~=7 then return false end
local tc=Duel.GetFieldCard(e:GetHandlerPlayer(),LOCATION_SZONE,13-seq)
return not tc or (not tc:IsSetCard(0x98) and not tc:IsSetCard(0x99))
end
......
script/c26270847.lua
View file @ ac298479
......@@ -11,9 +11,8 @@ function c26270847.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_UPDATE_ATTACK)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(LOCATION_MZONE,0)
e2:SetCondition(c26270847.atkcon)
e2:SetTarget(c26270847.atktg)
e2:SetValue(300)
c:RegisterEffect(e2)
......@@ -27,9 +26,6 @@ function c26270847.initial_effect(c)
e3:SetOperation(c26270847.operation)
c:RegisterEffect(e3)
end
function c26270847.atkcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c26270847.atktg(e,c)
return c:IsSetCard(0x9f)
end
......
script/c37991342.lua
View file @ ac298479
......@@ -12,18 +12,16 @@ function c37991342.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(1,0)
e2:SetCondition(c37991342.pendcon)
e2:SetTarget(c37991342.splimit)
c:RegisterEffect(e2)
--atk down
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD)
e3:SetRange(LOCATION_SZONE)
e3:SetRange(LOCATION_PZONE)
e3:SetCode(EFFECT_UPDATE_ATTACK)
e3:SetTargetRange(0,LOCATION_MZONE)
e3:SetCondition(c37991342.pendcon)
e3:SetValue(-300)
c:RegisterEffect(e3)
--summon with no tribute
......@@ -65,9 +63,6 @@ function c37991342.initial_effect(c)
e8:SetOperation(c37991342.desop)
c:RegisterEffect(e8)
end
function c37991342.pendcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c37991342.splimit(e,c)
return not c:IsSetCard(0xaa)
end
......
script/c4239451.lua
View file @ ac298479
......@@ -11,10 +11,9 @@ function c4239451.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(4239451,0))
e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
e2:SetCountLimit(1)
e2:SetCondition(c4239451.adcon)
e2:SetTarget(c4239451.adtg1)
e2:SetOperation(c4239451.adop1)
c:RegisterEffect(e2)
......@@ -31,9 +30,6 @@ function c4239451.initial_effect(c)
e3:SetOperation(c4239451.adop2)
c:RegisterEffect(e3)
end
function c4239451.adcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c4239451.filter(c)
return c:IsFaceup()
end
......
script/c43241495.lua
View file @ ac298479
......@@ -14,7 +14,7 @@ function c43241495.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_SPSUMMON_SUCCESS)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetCountLimit(1,43241495)
e2:SetCondition(c43241495.thcon)
e2:SetTarget(c43241495.thtg)
......@@ -35,8 +35,7 @@ function c43241495.cfilter(c,tp)
return c:IsControler(tp) and c:GetSummonType()==SUMMON_TYPE_PENDULUM
end
function c43241495.thcon(e,tp,eg,ep,ev,re,r,rp)
return (e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7)
and eg:IsExists(c43241495.cfilter,1,nil,tp)
return eg:IsExists(c43241495.cfilter,1,nil,tp)
end
function c43241495.filter(c)
return (c:GetSequence()==6 or c:GetSequence()==7) and c:IsAbleToHand()
......
script/c43785278.lua
View file @ ac298479
......@@ -18,7 +18,7 @@ function c43785278.regop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EVENT_PHASE+PHASE_END)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetCountLimit(1)
e1:SetRange(LOCATION_SZONE)
e1:SetRange(LOCATION_PZONE)
e1:SetTarget(c43785278.destg)
e1:SetOperation(c43785278.desop)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
......
script/c50485594.lua
View file @ ac298479
......@@ -12,9 +12,8 @@ function c50485594.initial_effect(c)
e2:SetDescription(aux.Stringid(50485594,0))
e2:SetCategory(CATEGORY_TOHAND)
e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetCountLimit(1,50485594+EFFECT_COUNT_CODE_DUEL)
e2:SetCondition(c50485594.thcon)
e2:SetCost(c50485594.thcost)
e2:SetTarget(c50485594.thtg)
e2:SetOperation(c50485594.thop)
......@@ -37,9 +36,6 @@ function c50485594.initial_effect(c)
e4:SetOperation(c50485594.spop)
c:RegisterEffect(e4)
end
function c50485594.thcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c50485594.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost() end
Duel.Remove(e:GetHandler(),POS_FACEUP,REASON_COST)
......
script/c64496451.lua
View file @ ac298479
......@@ -12,19 +12,17 @@ function c64496451.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(1,0)
e2:SetCondition(c64496451.pendcon)
e2:SetTarget(c64496451.splimit)
c:RegisterEffect(e2)
--atk up
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD)
e3:SetRange(LOCATION_SZONE)
e3:SetRange(LOCATION_PZONE)
e3:SetCode(EFFECT_UPDATE_ATTACK)
e3:SetTargetRange(LOCATION_MZONE,0)
e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xaa))
e3:SetCondition(c64496451.pendcon)
e3:SetValue(300)
c:RegisterEffect(e3)
--summon with no tribute
......@@ -73,9 +71,6 @@ function c64496451.initial_effect(c)
e9:SetLabelObject(e8)
c:RegisterEffect(e9)
end
function c64496451.pendcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c64496451.splimit(e,c)
return not c:IsSetCard(0xaa)
end
......
script/c65518099.lua
View file @ ac298479
......@@ -12,9 +12,8 @@ function c65518099.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(1,0)
e2:SetCondition(c65518099.pendcon)
e2:SetTarget(c65518099.splimit)
c:RegisterEffect(e2)
--tohand
......@@ -22,17 +21,13 @@ function c65518099.initial_effect(c)
e3:SetDescription(aux.Stringid(65518099,0))
e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e3:SetType(EFFECT_TYPE_IGNITION)
e3:SetRange(LOCATION_SZONE)
e3:SetRange(LOCATION_PZONE)
e3:SetCountLimit(1)
e3:SetCondition(c65518099.pendcon)
e3:SetCost(c65518099.cost)
e3:SetTarget(c65518099.target)
e3:SetOperation(c65518099.operation)
c:RegisterEffect(e3)
end
function c65518099.pendcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c65518099.splimit(e,c,tp,sumtp,sumpos)
return not c:IsSetCard(0xaa)
end
......
script/c78835747.lua
View file @ ac298479
......@@ -11,9 +11,8 @@ function c78835747.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_UPDATE_ATTACK)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(LOCATION_MZONE,0)
e2:SetCondition(c78835747.atkcon)
e2:SetTarget(c78835747.atktg)
e2:SetValue(300)
c:RegisterEffect(e2)
......@@ -28,9 +27,6 @@ function c78835747.initial_effect(c)
e3:SetOperation(c78835747.operation)
c:RegisterEffect(e3)
end
function c78835747.atkcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c78835747.atktg(e,c)
return c:IsAttribute(ATTRIBUTE_LIGHT)
end
......
script/c90885155.lua
View file @ ac298479
......@@ -12,18 +12,16 @@ function c90885155.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(1,0)
e2:SetCondition(c90885155.pendcon)
e2:SetTarget(c90885155.splimit)
c:RegisterEffect(e2)
--atk down
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD)
e3:SetRange(LOCATION_SZONE)
e3:SetRange(LOCATION_PZONE)
e3:SetCode(EFFECT_UPDATE_ATTACK)
e3:SetTargetRange(0,LOCATION_MZONE)
e3:SetCondition(c90885155.pendcon)
e3:SetValue(-300)
c:RegisterEffect(e3)
--summon with no tribute
......@@ -69,9 +67,6 @@ function c90885155.initial_effect(c)
e9:SetLabelObject(e8)
c:RegisterEffect(e9)
end
function c90885155.pendcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c90885155.splimit(e,c)
return not c:IsSetCard(0xaa)
end
......
script/c91907707.lua
View file @ ac298479
......@@ -12,19 +12,17 @@ function c91907707.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetTargetRange(1,0)
e2:SetCondition(c91907707.pendcon)
e2:SetTarget(c91907707.splimit)
c:RegisterEffect(e2)
--atk up
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD)
e3:SetRange(LOCATION_SZONE)
e3:SetRange(LOCATION_PZONE)
e3:SetCode(EFFECT_UPDATE_ATTACK)
e3:SetTargetRange(LOCATION_MZONE,0)
e3:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xaa))
e3:SetCondition(c91907707.pendcon)
e3:SetValue(300)
c:RegisterEffect(e3)
--summon with no tribute
......@@ -66,9 +64,6 @@ function c91907707.initial_effect(c)
e8:SetOperation(c91907707.thop)
c:RegisterEffect(e8)
end
function c91907707.pendcon(e)
return e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7
end
function c91907707.splimit(e,c)
return not c:IsSetCard(0xaa)
end
......
script/c94415058.lua
View file @ ac298479
......@@ -11,7 +11,7 @@ function c94415058.initial_effect(c)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetCode(EVENT_ATTACK_ANNOUNCE)
e2:SetRange(LOCATION_SZONE)
e2:SetRange(LOCATION_PZONE)
e2:SetCondition(c94415058.actcon)
e2:SetOperation(c94415058.actop)
c:RegisterEffect(e2)
......@@ -23,7 +23,7 @@ function c94415058.initial_effect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_CHANGE_LSCALE)
e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e4:SetRange(LOCATION_SZONE)
e4:SetRange(LOCATION_PZONE)
e4:SetCondition(c94415058.sccon)
e4:SetValue(4)
c:RegisterEffect(e4)
......@@ -46,8 +46,7 @@ end
function c94415058.actcon(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetAttacker()
if tc:IsControler(1-tp) then tc=Duel.GetAttackTarget() end
return (e:GetHandler():GetSequence()==6 or e:GetHandler():GetSequence()==7)
and tc and tc:IsControler(tp) and tc:IsType(TYPE_PENDULUM)
return tc and tc:IsControler(tp) and tc:IsType(TYPE_PENDULUM)
end
function c94415058.actop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler())
......@@ -64,7 +63,6 @@ function c94415058.aclimit(e,re,tp)
end
function c94415058.sccon(e)
local seq=e:GetHandler():GetSequence()
if seq~=6 and seq~=7 then return false end
local tc=Duel.GetFieldCard(e:GetHandlerPlayer(),LOCATION_SZONE,13-seq)
return not tc or (not tc:IsSetCard(0x98) and not tc:IsSetCard(0x99))
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