Skip to content

Y
ygopro-scripts-888
Commit cf11db84 authored by wind2009's avatar wind2009
Browse files
Options

Merge remote-tracking branch 'upstream/patch-new-2024' into mc_master

parents 17c0ac4c 6107f737
Show whitespace changes
Inline Side-by-side
Showing with 35 additions and 21 deletions
c12381100.lua
View file @ cf11db84
...@@ -79,8 +79,14 @@ function s.Blue_Eyes_Ultimate_Dragon(c) ...@@ -79,8 +79,14 @@ function s.Blue_Eyes_Ultimate_Dragon(c)
return c:IsFusionCode(23995346) and not c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) return c:IsFusionCode(23995346) and not c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)
or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)
end end
---@param g Group
---@param fc Card
---@param ec Card
---@param chkf integer
---@return boolean
function s.FShaddollSpgcheck(g,fc,ec,chkf) function s.FShaddollSpgcheck(g,fc,ec,chkf)
local sg=g:Clone() local sg=g:Clone()
local tp=fc:GetControler()
sg:AddCard(ec) sg:AddCard(ec)
local c=g:Filter(s.Blue_Eyes_Ultimate_Dragon,nil):GetFirst() local c=g:Filter(s.Blue_Eyes_Ultimate_Dragon,nil):GetFirst()
if aux.FCheckAdditional and not aux.FCheckAdditional(tp,sg,fc) if aux.FCheckAdditional and not aux.FCheckAdditional(tp,sg,fc)
...@@ -95,6 +101,7 @@ function s.Necessarily_FShaddollFilter(c,gc) ...@@ -95,6 +101,7 @@ function s.Necessarily_FShaddollFilter(c,gc)
return c:IsCode(gc:GetCode()) return c:IsCode(gc:GetCode())
end end
function s.Necessarily_FShaddollSpgcheck(g,gc,fc,ec,chkf) function s.Necessarily_FShaddollSpgcheck(g,gc,fc,ec,chkf)
local tp=fc:GetControler()
local c=g:Filter(s.Blue_Eyes_Ultimate_Dragon,nil):GetFirst() local c=g:Filter(s.Blue_Eyes_Ultimate_Dragon,nil):GetFirst()
local sg=g:Clone() local sg=g:Clone()
sg:AddCard(ec) sg:AddCard(ec)
......
c83589191.lua
View file @ cf11db84
...@@ -34,23 +34,25 @@ function c83589191.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -34,23 +34,25 @@ function c83589191.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.SelectTarget(tp,c83589191.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,1-tp) Duel.SelectTarget(tp,c83589191.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,1-tp)
end end
function c83589191.activate(e,tp,eg,ep,ev,re,r,rp) function c83589191.activate(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsType(TYPE_MONSTER) then if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsType(TYPE_MONSTER)
local e1=Effect.CreateEffect(e:GetHandler()) and not tc:IsImmuneToEffect(e) and not tc:IsAttack(Duel.GetLP(1-tp)) then
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetCode(EFFECT_SET_ATTACK_FINAL)
e1:SetValue(Duel.GetLP(1-tp)) e1:SetValue(Duel.GetLP(1-tp))
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end local e2=Effect.CreateEffect(c)
local e2=Effect.CreateEffect(e:GetHandler())
e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE) e2:SetCode(EFFECT_CHANGE_DAMAGE)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e2:SetTargetRange(0,1) e2:SetTargetRange(0,1)
e2:SetValue(HALF_DAMAGE) e2:SetValue(c83589191.damval)
e2:SetReset(RESET_PHASE+PHASE_END) e2:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e2,tp) Duel.RegisterEffect(e2,tp)
end
end end
function c83589191.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c83589191.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c83589191.filter(chkc,tp) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and c83589191.filter(chkc,tp) end
...@@ -59,21 +61,26 @@ function c83589191.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -59,21 +61,26 @@ function c83589191.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.SelectTarget(tp,c83589191.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,tp) Duel.SelectTarget(tp,c83589191.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,tp)
end end
function c83589191.atkop(e,tp,eg,ep,ev,re,r,rp) function c83589191.atkop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsType(TYPE_MONSTER) then if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsType(TYPE_MONSTER)
local e1=Effect.CreateEffect(e:GetHandler()) and not tc:IsImmuneToEffect(e) and not tc:IsAttack(Duel.GetLP(tp)) then
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK_FINAL) e1:SetCode(EFFECT_SET_ATTACK_FINAL)
e1:SetValue(Duel.GetLP(tp)) e1:SetValue(Duel.GetLP(tp))
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end local e2=Effect.CreateEffect(c)
local e2=Effect.CreateEffect(e:GetHandler())
e2:SetType(EFFECT_TYPE_FIELD) e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CHANGE_BATTLE_DAMAGE) e2:SetCode(EFFECT_CHANGE_DAMAGE)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e2:SetTargetRange(0,1) e2:SetTargetRange(0,1)
e2:SetValue(HALF_DAMAGE) e2:SetValue(c83589191.damval)
e2:SetReset(RESET_PHASE+PHASE_END) e2:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e2,tp) Duel.RegisterEffect(e2,tp)
end
end
function c83589191.damval(e,re,val,r,rp,rc)
return math.floor(val/2)
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