Commit a838e5d1 authored by wind2009's avatar wind2009

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

parents f38c4604 443e0580
...@@ -77,4 +77,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -77,4 +77,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.atkcon(e) function s.atkcon(e)
return Duel.IsExistingMatchingCard(s.cfilter,e:GetHandlerPlayer(),LOCATION_GRAVE+LOCATION_ONFIELD,0,1,nil) return Duel.IsExistingMatchingCard(s.cfilter,e:GetHandlerPlayer(),LOCATION_GRAVE+LOCATION_ONFIELD,0,1,nil)
end end
\ No newline at end of file
...@@ -85,4 +85,4 @@ end ...@@ -85,4 +85,4 @@ end
function c12612470.posop(e,tp,eg,ep,ev,re,r,rp) function c12612470.posop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetMatchingGroup(c12612470.posfilter,tp,LOCATION_MZONE,LOCATION_MZONE,e:GetHandler(),e) local g=Duel.GetMatchingGroup(c12612470.posfilter,tp,LOCATION_MZONE,LOCATION_MZONE,e:GetHandler(),e)
Duel.ChangePosition(g,POS_FACEDOWN_DEFENSE) Duel.ChangePosition(g,POS_FACEDOWN_DEFENSE)
end end
\ No newline at end of file
...@@ -72,4 +72,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,4 +72,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Recover(p,d,REASON_EFFECT) Duel.Recover(p,d,REASON_EFFECT)
end end
end end
end end
\ No newline at end of file
...@@ -78,4 +78,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -78,4 +78,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
if e:GetHandler():IsRelateToEffect(e) then if e:GetHandler():IsRelateToEffect(e) then
Duel.SendtoDeck(e:GetHandler(),nil,SEQ_DECKSHUFFLE,REASON_EFFECT) Duel.SendtoDeck(e:GetHandler(),nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -92,4 +92,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -92,4 +92,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
end end
end end
\ No newline at end of file
...@@ -50,4 +50,4 @@ function c24079759.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,4 +50,4 @@ function c24079759.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -90,4 +90,4 @@ function s.activate3(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,4 +90,4 @@ function s.activate3(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(g,REASON_EFFECT) Duel.Destroy(g,REASON_EFFECT)
end end
end end
end end
\ No newline at end of file
...@@ -76,4 +76,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -76,4 +76,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.splimit(e,c,sump,sumtype,sumpos,targetp,se) function s.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return not c:IsRace(RACE_PLANT) return not c:IsRace(RACE_PLANT)
end end
\ No newline at end of file
...@@ -95,4 +95,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -95,4 +95,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
if tg:GetCount()>0 then if tg:GetCount()>0 then
Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEUP_DEFENSE) Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEUP_DEFENSE)
end end
end end
\ No newline at end of file
...@@ -148,4 +148,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -148,4 +148,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
end end
tc:CompleteProcedure() tc:CompleteProcedure()
end end
end end
\ No newline at end of file
...@@ -69,4 +69,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -69,4 +69,4 @@ function s.spop(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
...@@ -80,4 +80,4 @@ end ...@@ -80,4 +80,4 @@ end
function s.efilter(e,te) function s.efilter(e,te)
return (te:IsActiveType(TYPE_MONSTER) and te:GetOwner()~=e:GetOwner()) or (te:GetOwnerPlayer()~=e:GetOwnerPlayer() and te:IsActivated() return (te:IsActiveType(TYPE_MONSTER) and te:GetOwner()~=e:GetOwner()) or (te:GetOwnerPlayer()~=e:GetOwnerPlayer() and te:IsActivated()
and te:IsActiveType(TYPE_SPELL)) and te:IsActiveType(TYPE_SPELL))
end end
\ No newline at end of file
...@@ -99,4 +99,4 @@ function s.spfgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -99,4 +99,4 @@ function s.spfgop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
Duel.SpecialSummon(c,0,tp,1-tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,1-tp,false,false,POS_FACEUP)
end end
end end
\ No newline at end of file
...@@ -77,4 +77,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -77,4 +77,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(c,nil,REASON_EFFECT) Duel.SendtoHand(c,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,c) Duel.ConfirmCards(1-tp,c)
end end
end end
\ No newline at end of file
...@@ -39,4 +39,4 @@ function c27868563.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -39,4 +39,4 @@ function c27868563.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function c27868563.splimit(e,c) function c27868563.splimit(e,c)
return c:IsCode(27868563) return c:IsCode(27868563)
end end
\ No newline at end of file
...@@ -96,4 +96,4 @@ function c34001672.mtop(e,tp,eg,ep,ev,re,r,rp) ...@@ -96,4 +96,4 @@ function c34001672.mtop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.Overlay(c,g) Duel.Overlay(c,g)
end end
end end
\ No newline at end of file
...@@ -115,4 +115,4 @@ function s.penop(e,tp,eg,ep,ev,re,r,rp) ...@@ -115,4 +115,4 @@ function s.penop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true) Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
end end
end end
\ No newline at end of file
...@@ -54,4 +54,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -54,4 +54,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Overlay(sc,Group.FromCards(tc)) Duel.Overlay(sc,Group.FromCards(tc))
end end
end end
end end
\ No newline at end of file
...@@ -89,4 +89,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,4 +89,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
end end
\ No newline at end of file
...@@ -56,4 +56,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -56,4 +56,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -118,4 +118,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) ...@@ -118,4 +118,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
end end
end end
\ No newline at end of file
...@@ -65,4 +65,4 @@ function s.operation2(e,tp,eg,ep,ev,re,r,rp) ...@@ -65,4 +65,4 @@ function s.operation2(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(TYPE_TRAP+TYPE_CONTINUOUS) e1:SetValue(TYPE_TRAP+TYPE_CONTINUOUS)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
end end
\ No newline at end of file
...@@ -87,4 +87,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -87,4 +87,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
end end
end end
\ No newline at end of file
...@@ -71,4 +71,4 @@ function c50951254.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,4 +71,4 @@ function c50951254.spop(e,tp,eg,ep,ev,re,r,rp)
c:RegisterEffect(e1,true) c:RegisterEffect(e1,true)
Duel.Draw(tp,1,REASON_EFFECT) Duel.Draw(tp,1,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -50,4 +50,4 @@ function s.tsop(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -50,4 +50,4 @@ function s.tsop(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function s.filter(c,e,tp,chk) function s.filter(c,e,tp,chk)
return c:IsRace(RACE_DRAGON+RACE_WARRIOR) and c:IsType(TYPE_RITUAL) and c:IsAttribute(ATTRIBUTE_LIGHT) and (not chk or c~=e:GetHandler()) return c:IsRace(RACE_DRAGON+RACE_WARRIOR) and c:IsType(TYPE_RITUAL) and c:IsAttribute(ATTRIBUTE_LIGHT) and (not chk or c~=e:GetHandler())
end end
\ No newline at end of file
...@@ -68,4 +68,4 @@ function c51473858.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,4 +68,4 @@ function c51473858.spop2(e,tp,eg,ep,ev,re,r,rp)
end end
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
end end
end end
\ No newline at end of file
...@@ -48,4 +48,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -48,4 +48,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,true,false,POS_FACEUP) Duel.SpecialSummon(g,0,tp,tp,true,false,POS_FACEUP)
end end
end end
\ No newline at end of file
...@@ -57,4 +57,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,4 +57,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end end
end end
\ No newline at end of file
...@@ -61,4 +61,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,4 +61,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
\ No newline at end of file
...@@ -72,4 +72,4 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) ...@@ -72,4 +72,4 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Draw(tp,1,REASON_EFFECT) Duel.Draw(tp,1,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -59,4 +59,4 @@ function c64257161.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -59,4 +59,4 @@ function c64257161.spop2(e,tp,eg,ep,ev,re,r,rp)
end end
Duel.SpecialSummonComplete() Duel.SpecialSummonComplete()
end end
end end
\ No newline at end of file
...@@ -90,4 +90,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,4 +90,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
tc=g:GetNext() tc=g:GetNext()
end end
end end
end end
\ No newline at end of file
...@@ -74,4 +74,4 @@ function s.atklimit(e,c) ...@@ -74,4 +74,4 @@ function s.atklimit(e,c)
end end
function s.reftg(e,c) function s.reftg(e,c)
return c:IsFaceup() and c:IsSetCard(0x1a5) return c:IsFaceup() and c:IsSetCard(0x1a5)
end end
\ No newline at end of file
...@@ -62,4 +62,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -62,4 +62,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.splimit(e,c,sump,sumtype,sumpos,targetp,se) function s.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return not c:IsSetCard(0xd0,0xc7) and c:IsLocation(LOCATION_EXTRA) return not c:IsSetCard(0xd0,0xc7) and c:IsLocation(LOCATION_EXTRA)
end end
\ No newline at end of file
...@@ -92,4 +92,4 @@ function s.spsop(e,tp,eg,ep,ev,re,r,rp) ...@@ -92,4 +92,4 @@ function s.spsop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,s.sfilter,tp,LOCATION_SZONE,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,s.sfilter,tp,LOCATION_SZONE,0,1,1,nil,e,tp)
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end end
\ No newline at end of file
...@@ -89,4 +89,4 @@ function s.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,4 +89,4 @@ function s.adop(e,tp,eg,ep,ev,re,r,rp)
tc=g:GetNext() tc=g:GetNext()
end end
end end
end end
\ No newline at end of file
...@@ -55,4 +55,4 @@ function c74289646.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -55,4 +55,4 @@ function c74289646.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.HintSelection(sg) Duel.HintSelection(sg)
Duel.Destroy(sg,REASON_EFFECT) Duel.Destroy(sg,REASON_EFFECT)
end end
end end
\ No newline at end of file
...@@ -54,4 +54,4 @@ end ...@@ -54,4 +54,4 @@ end
function c85401123.drop(e,tp,eg,ep,ev,re,r,rp) function c85401123.drop(e,tp,eg,ep,ev,re,r,rp)
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
Duel.Draw(p,d,REASON_EFFECT) Duel.Draw(p,d,REASON_EFFECT)
end end
\ No newline at end of file
...@@ -81,4 +81,4 @@ end ...@@ -81,4 +81,4 @@ end
function s.gfcon(e) function s.gfcon(e)
local c=e:GetHandler() local c=e:GetHandler()
return c:IsSetCard(0xba) and c:IsType(TYPE_XYZ) return c:IsSetCard(0xba) and c:IsType(TYPE_XYZ)
end end
\ No newline at end of file
...@@ -70,4 +70,4 @@ function s.fpop(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,4 +70,4 @@ function s.fpop(e,tp,eg,ep,ev,re,r,rp)
Duel.ChangePosition(g:GetFirst(),POS_FACEDOWN_DEFENSE) Duel.ChangePosition(g:GetFirst(),POS_FACEDOWN_DEFENSE)
end end
end end
end end
\ No newline at end of file
...@@ -118,4 +118,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -118,4 +118,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
end end
function s.fuslimit(e,c,sumtype) function s.fuslimit(e,c,sumtype)
return sumtype==SUMMON_TYPE_FUSION return sumtype==SUMMON_TYPE_FUSION
end end
\ No newline at end of file
...@@ -90,4 +90,4 @@ function s.mvop(e,tp,eg,ep,ev,re,r,rp) ...@@ -90,4 +90,4 @@ function s.mvop(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS) e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
end end
\ No newline at end of file
...@@ -68,4 +68,4 @@ function s.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -68,4 +68,4 @@ function s.adop(e,tp,eg,ep,ev,re,r,rp)
c:RegisterEffect(e1) c:RegisterEffect(e1)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Damage(1-tp,dam*300,REASON_EFFECT) Duel.Damage(1-tp,dam*300,REASON_EFFECT)
end end
\ No newline at end of file
...@@ -120,4 +120,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -120,4 +120,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
end end
tc:CompleteProcedure() tc:CompleteProcedure()
end end
end end
\ No newline at end of file
...@@ -88,4 +88,4 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp) ...@@ -88,4 +88,4 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1) tc:RegisterEffect(e1)
end end
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