Skip to content

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

Merge remote-tracking branch 'upstream/master' into master

parents 1aebf7e3 1e3d0091
Hide whitespace changes
Inline Side-by-side
Showing with 12 additions and 1 deletion
c19089195.lua
View file @ a840859e
...@@ -62,7 +62,7 @@ function c19089195.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -62,7 +62,7 @@ function c19089195.activate(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c19089195.econ(e,tp,eg,ep,ev,re,r,rp) function c19089195.econ(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsEnvironment(22702055) return Duel.IsEnvironment(22702055) and not Duel.IsPlayerAffectedByEffect(tp,19089195)
end end
function c19089195.costfilter(c) function c19089195.costfilter(c)
return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToRemoveAsCost() return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToRemoveAsCost()
...@@ -89,6 +89,13 @@ function c19089195.retop(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,6 +89,13 @@ function c19089195.retop(e,tp,eg,ep,ev,re,r,rp)
Duel.ReturnToField(e:GetLabelObject()) Duel.ReturnToField(e:GetLabelObject())
end end
function c19089195.remop(e,tp,eg,ep,ev,re,r,rp) function c19089195.remop(e,tp,eg,ep,ev,re,r,rp)
local e0=Effect.CreateEffect(e:GetHandler())
e0:SetType(EFFECT_TYPE_FIELD)
e0:SetCode(19089195)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e0,tp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
......
c24382602.lua
View file @ a840859e
...@@ -48,6 +48,7 @@ function c24382602.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -48,6 +48,7 @@ function c24382602.atktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
and Duel.IsExistingMatchingCard(c24382602.filter,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil) end and Duel.IsExistingMatchingCard(c24382602.filter,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
Duel.SelectTarget(tp,c24382602.tgfilter,tp,LOCATION_MZONE,0,1,1,nil) Duel.SelectTarget(tp,c24382602.tgfilter,tp,LOCATION_MZONE,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_HAND+LOCATION_DECK)
end end
function c24382602.atkop(e,tp,eg,ep,ev,re,r,rp) function c24382602.atkop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
......
c4472318.lua
View file @ a840859e
...@@ -52,6 +52,8 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,6 +52,8 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.spcfilter(c,tp) function s.spcfilter(c,tp)
return c:IsReason(REASON_BATTLE+REASON_EFFECT) return c:IsReason(REASON_BATTLE+REASON_EFFECT)
and not c:IsPreviousLocation(LOCATION_SZONE)
and (c:IsPreviousLocation(LOCATION_MZONE) or c:GetOriginalType()&TYPE_MONSTER~=0)
and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_HAND+LOCATION_ONFIELD) and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_HAND+LOCATION_ONFIELD)
end end
function s.regcon(e,tp,eg,ep,ev,re,r,rp) function s.regcon(e,tp,eg,ep,ev,re,r,rp)
......
c8522996.lua
View file @ a840859e
...@@ -69,6 +69,7 @@ function c8522996.chop(e,tp,eg,ep,ev,re,r,rp) ...@@ -69,6 +69,7 @@ function c8522996.chop(e,tp,eg,ep,ev,re,r,rp)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_SINGLE)
e2:SetCode(EFFECT_DOUBLE_TRIBUTE) e2:SetCode(EFFECT_DOUBLE_TRIBUTE)
e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e2:SetValue(c8522996.condition) e2:SetValue(c8522996.condition)
e2:SetReset(RESET_EVENT+RESETS_STANDARD) e2:SetReset(RESET_EVENT+RESETS_STANDARD)
c:RegisterEffect(e2) c:RegisterEffect(e2)
......
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