Skip to content

Y
ygopro-2pick
Commit d88606aa authored by argon.sun's avatar argon.sun
Browse files
Options

fix & new scripts

parent 1beeb770
Hide whitespace changes
Inline Side-by-side
Showing with 9 additions and 128 deletions
ocgcore/card.cpp
View file @ d88606aa
......@@ -882,7 +882,7 @@ void card::reset(uint32 id, uint32 reset_type) {
if (rrm->second & 0xffff0000 & id)
relations.erase(rrm);
}
if(id & 0x7f0000)
if(id & 0x7c0000)
relate_effect.clear();
if(id & 0x1fc0000) {
announced_cards.clear();
......
script/c10000040.lua
View file @ d88606aa
......@@ -22,13 +22,6 @@ function c10000040.initial_effect(c)
e3:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
c:RegisterEffect(e3)
--win
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e4:SetCode(EVENT_SPSUMMON_SUCCESS)
e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e4:SetOperation(c10000040.winop)
c:RegisterEffect(e4)
end
function c10000040.spfilter(c,code)
return c:GetOriginalCode()==code
......@@ -47,8 +40,6 @@ function c10000040.spop(e,tp,eg,ep,ev,re,r,rp,c)
g1:Merge(g2)
g1:Merge(g3)
Duel.Release(g1,REASON_COST)
end
function c10000040.winop(e,tp,eg,ep,ev,re,r,rp)
local WIN_REASON_CREATORGOD = 0x13
Duel.Win(e:GetHandler():GetSummonPlayer(),WIN_REASON_CREATORGOD)
Duel.Win(tp,WIN_REASON_CREATORGOD)
end
script/c37115575.lua
View file @ d88606aa
......@@ -6,7 +6,7 @@ function c37115575.initial_effect(c)
e1:SetDescription(aux.Stringid(37115575,0))
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CHAIN_UNIQUE)
e1:SetCode(EVENT_DESTROY)
e1:SetRange(LOCATION_HAND+LOCATION_GRAVE)
e1:SetCondition(c37115575.spcon)
......
script/c48568032.lua deleted 100644 → 0
View file @ 1beeb770
--トライゴン
function c48568032.initial_effect(c)
--equip
local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(48568032,0))
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetCategory(CATEGORY_EQUIP)
e1:SetType(EFFECT_TYPE_IGNITION)
e1:SetRange(LOCATION_MZONE)
e1:SetTarget(c48568032.eqtg)
e1:SetOperation(c48568032.eqop)
c:RegisterEffect(e1)
--unequip
local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(48568032,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_IGNITION)
e2:SetRange(LOCATION_SZONE)
e2:SetCondition(c48568032.uncon)
e2:SetTarget(c48568032.sptg)
e2:SetOperation(c48568032.spop)
c:RegisterEffect(e2)
--destroy sub
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_EQUIP)
e3:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
e3:SetCode(EFFECT_DESTROY_SUBSTITUTE)
e3:SetCondition(c48568032.uncon)
e3:SetValue(1)
c:RegisterEffect(e3)
--eqlimit
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_EQUIP_LIMIT)
e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e4:SetValue(aux.TargetBoolFunction(Card.IsRace,RACE_MACHINE))
c:RegisterEffect(e4)
--spsummon
local e5=Effect.CreateEffect(c)
e5:SetDescription(aux.Stringid(48568032,2))
e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
e5:SetType(EFFECT_TYPE_TRIGGER_F+EFFECT_TYPE_FIELD)
e5:SetRange(LOCATION_SZONE)
e5:SetCode(EVENT_BATTLE_DESTROYING)
e5:SetCondition(c48568032.spcon2)
e5:SetTarget(c48568032.sptg2)
e5:SetOperation(c48568032.spop2)
c:RegisterEffect(e5)
end
function c48568032.uncon(e)
return e:GetHandler():IsStatus(STATUS_UNION)
end
function c48568032.filter(c)
return c:IsFaceup() and c:IsRace(RACE_MACHINE) and c:GetUnionCount()==0
end
function c48568032.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c48568032.filter(chkc) end
if chk==0 then return e:GetHandler():GetFlagEffect(48568032)==0 and Duel.GetLocationCount(tp,LOCATION_SZONE)>0
and Duel.IsExistingTarget(c48568032.filter,tp,LOCATION_MZONE,0,1,e:GetHandler()) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
local g=Duel.SelectTarget(tp,c48568032.filter,tp,LOCATION_MZONE,0,1,1,e:GetHandler())
Duel.SetOperationInfo(0,CATEGORY_EQUIP,g,1,0,0)
e:GetHandler():RegisterFlagEffect(48568032,RESET_EVENT+0x7e0000+RESET_PHASE+PHASE_END,0,1)
end
function c48568032.eqop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
local tc=g:GetFirst()
if not c:IsRelateToEffect(e) or c:IsFacedown() then return end
if not tc:IsRelateToEffect(e) or not c48568032.filter(tc) then
Duel.SendtoGrave(c,REASON_EFFECT)
return
end
if not Duel.Equip(tp,c,tc,false) then return end
c:SetStatus(STATUS_UNION,true)
end
function c48568032.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():GetFlagEffect(48568032)==0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
e:GetHandler():RegisterFlagEffect(48568032,RESET_EVENT+0x7e0000+RESET_PHASE+PHASE_END,0,1)
end
function c48568032.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if c:IsRelateToEffect(e) then
Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP_ATTACK)
end
end
function c48568032.sfilter(c)
return c:IsSetCard(0x36) and c:GetCode()~=42940404 and c:IsAbleToHand()
end
function c48568032.spcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsStatus(STATUS_UNION) and eg:GetFirst()==e:GetHandler():GetEquipTarget()
end
function c48568032.spfilter(c,e,tp)
return c:IsLevelBelow(4) and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_LIGHT)
and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end
function c48568032.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c48568032.spfilter(chkc,e,tp) end
if chk==0 then return true end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectTarget(tp,c48568032.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,g:GetCount(),0,0)
end
function c48568032.spop2(e,tp,eg,ep,ev,re,r,rp)
if not e:GetHandler():IsRelateToEffect(e) then return end
local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end
end
script/c75498415.lua
View file @ d88606aa
......@@ -27,8 +27,8 @@ end
function c75498415.ntcon(e,c)
if c==nil then return true end
return c:GetLevel()>4 and Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0
and Duel.GetFieldGroupCount(c:GetControler(),LOCATION_MZONE,0,nil)==0
and Duel.GetFieldGroupCount(c:GetControler(),0,LOCATION_MZONE,nil)>0
and Duel.GetFieldGroupCount(c:GetControler(),LOCATION_MZONE,0)==0
and Duel.GetFieldGroupCount(c:GetControler(),0,LOCATION_MZONE)>0
end
function c75498415.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()==PHASE_MAIN1
......
script/c76714458.lua
View file @ d88606aa
......@@ -24,6 +24,7 @@ function c76714458.operation(e,tp,eg,ep,ev,re,r,rp)
e1:SetTargetRange(1,0)
e1:SetLabel(cid)
e1:SetValue(c76714458.refcon)
e1:SetReset(RESET_CHAIN)
Duel.RegisterEffect(e1,tp)
end
function c76714458.refcon(e,re,val,r,rp,rc)
......
script/c78783370.lua
View file @ d88606aa
......@@ -10,7 +10,7 @@ function c78783370.initial_effect(c)
c:RegisterEffect(e1)
end
function c78783370.condition(e,tp,eg,ep,ev,re,r,rp)
if re:GetHandler():IsType(TYPE_SPELL+TYPE_TRAP) and not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
if re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and not re:IsHasType(EFFECT_TYPE_ACTIVATE) then return false end
local ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_DAMAGE)
if ex then return true end
ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_RECOVER)
......@@ -29,6 +29,7 @@ function c78783370.operation(e,tp,eg,ep,ev,re,r,rp)
e1:SetTargetRange(1,0)
e1:SetLabel(cid)
e1:SetValue(c78783370.refcon)
e1:SetReset(RESET_CHAIN)
Duel.RegisterEffect(e1,tp)
end
function c78783370.refcon(e,re,val,r,rp,rc)
......
script/c96914272.lua
View file @ d88606aa
......@@ -47,7 +47,7 @@ function c96914272.lvop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_LEVEL)
if lv>clv then
if lv<clv then
if Duel.SelectOption(tp,aux.Stringid(96914272,1),aux.Stringid(96914272,2))==0 then
e1:SetValue(lv)
else e1:SetValue(-lv) 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