Skip to content

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

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

parents 1df9d642 86c1d407
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 9 deletions
c74289646.lua
View file @ 1aebf7e3
...@@ -11,6 +11,7 @@ function c74289646.initial_effect(c) ...@@ -11,6 +11,7 @@ function c74289646.initial_effect(c)
e1:SetOperation(c74289646.operation) e1:SetOperation(c74289646.operation)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
c74289646.toss_dice=true
function c74289646.target(e,tp,eg,ep,ev,re,r,rp,chk) function c74289646.target(e,tp,eg,ep,ev,re,r,rp,chk)
local cl=Duel.GetCurrentChain() local cl=Duel.GetCurrentChain()
if chk==0 then return true end if chk==0 then return true end
......
c90711610.lua
View file @ 1aebf7e3
...@@ -39,13 +39,13 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,13 +39,13 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect() if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)
if Duel.CheckRemoveOverlayCard(tp,1,1,1,REASON_EFFECT) and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) then and Duel.CheckRemoveOverlayCard(tp,1,1,1,REASON_EFFECT)
if Duel.SelectEffectYesNo(tp,e:GetHandler(),aux.Stringid(id,2)) then and Duel.SelectEffectYesNo(tp,e:GetHandler(),aux.Stringid(id,2)) then
Duel.RemoveOverlayCard(tp,1,1,1,1,REASON_EFFECT) Duel.BreakEffect()
local sg=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp) Duel.RemoveOverlayCard(tp,1,1,1,1,REASON_EFFECT)
Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP) local sg=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
end Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
end end
end end
end end
......
c99529628.lua
View file @ 1aebf7e3
...@@ -92,7 +92,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp) ...@@ -92,7 +92,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp)
local res1,tg1=Duel.GetOperationInfo(0,CATEGORY_REMOVE) local res1,tg1=Duel.GetOperationInfo(0,CATEGORY_REMOVE)
local res2,tg2=Duel.GetOperationInfo(0,CATEGORY_SPECIAL_SUMMON) local res2,tg2=Duel.GetOperationInfo(0,CATEGORY_SPECIAL_SUMMON)
local c,rc,sc=e:GetHandler(),tg1:GetFirst(),tg2:GetFirst() local c,rc,sc=e:GetHandler(),tg1:GetFirst(),tg2:GetFirst()
if rc:IsRelateToEffect(e) and rc:IsType(TYPE_MONSTER) and c:IsOnField() if rc:IsRelateToEffect(e) and rc:IsControler(1-tp) and rc:IsType(TYPE_MONSTER) and c:IsOnField()
and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)*Duel.Remove(tg1,POS_FACEUP,REASON_EFFECT)>0 then and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)*Duel.Remove(tg1,POS_FACEUP,REASON_EFFECT)>0 then
if sc:IsRelateToEffect(e) and sc:IsRace(RACE_FISH) then if sc:IsRelateToEffect(e) and sc:IsRace(RACE_FISH) then
Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(sc,0,tp,tp,false,false,POS_FACEUP)
...@@ -117,4 +117,4 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp) ...@@ -117,4 +117,4 @@ function s.spop1(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if not c:IsRelateToEffect(e) then return end if not c:IsRelateToEffect(e) then return end
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end end
\ No newline at end of file
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