Commit 46e9ee66 authored by POLYMER's avatar POLYMER

fix

parent c467c9ef
...@@ -52,7 +52,6 @@ function c28318460.activate(e,tp,eg,ep,ev,re,r,rp,op) ...@@ -52,7 +52,6 @@ function c28318460.activate(e,tp,eg,ep,ev,re,r,rp,op)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c28318460.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil):GetFirst() local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c28318460.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil):GetFirst()
if tc then if tc then
Duel.DisableShuffleCheck()
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
if tc:IsPreviousLocation(LOCATION_DECK) then if tc:IsPreviousLocation(LOCATION_DECK) then
......
...@@ -50,7 +50,7 @@ function c44401030.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,7 +50,7 @@ function c44401030.activate(e,tp,eg,ep,ev,re,r,rp)
for tc in aux.Next(g) do for tc in aux.Next(g) do
Duel.NegateRelatedChain(tc,RESET_TURN_SET) Duel.NegateRelatedChain(tc,RESET_TURN_SET)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetDescription(aux.Stringid(44401030,1)) e1:SetDescription(aux.Stringid(44401030,0))
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_DISABLE) e1:SetCode(EFFECT_DISABLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CLIENT_HINT)
......
...@@ -83,5 +83,5 @@ function c51927045.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -83,5 +83,5 @@ function c51927045.operation(e,tp,eg,ep,ev,re,r,rp)
rc:RegisterEffect(e1) rc:RegisterEffect(e1)
end end
function c51927045.splimit(e,c,sump,sumtype,sumpos,targetp,se) function c51927045.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return se==nil return se==nil or not se:IsHasType(EFFECT_TYPE_ACTIONS)
end end
...@@ -47,7 +47,7 @@ function c51927071.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function c51927071.checkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetDescription(aux.Stringid(51927071,1)) e1:SetDescription(aux.Stringid(51927071,1))
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e1:SetCondition(c51927071.indcon) e1:SetCondition(c51927071.indcon)
e1:SetValue(1) e1:SetValue(1)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
......
...@@ -62,7 +62,7 @@ function c51927072.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -62,7 +62,7 @@ function c51927072.checkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetDescription(aux.Stringid(51927072,1)) e1:SetDescription(aux.Stringid(51927072,1))
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT) e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e1:SetCondition(c51927072.indcon) e1:SetCondition(c51927072.indcon)
e1:SetValue(1) e1:SetValue(1)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
......
...@@ -52,7 +52,7 @@ function c51927073.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,7 +52,7 @@ function c51927073.checkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetDescription(aux.Stringid(51927073,1)) e1:SetDescription(aux.Stringid(51927073,1))
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetCode(EFFECT_IMMUNE_EFFECT)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e1:SetCondition(c51927073.indcon) e1:SetCondition(c51927073.indcon)
e1:SetValue(c51927073.efilter) e1:SetValue(c51927073.efilter)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
......
...@@ -49,7 +49,7 @@ function c51927074.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,7 +49,7 @@ function c51927074.checkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetDescription(aux.Stringid(51927074,1)) e1:SetDescription(aux.Stringid(51927074,1))
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET) e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e1:SetCondition(c51927074.indcon) e1:SetCondition(c51927074.indcon)
e1:SetValue(aux.tgoval) e1:SetValue(aux.tgoval)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
......
...@@ -53,7 +53,7 @@ function c51927075.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -53,7 +53,7 @@ function c51927075.checkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetDescription(aux.Stringid(51927075,1)) e1:SetDescription(aux.Stringid(51927075,1))
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_IMMUNE_EFFECT) e1:SetCode(EFFECT_IMMUNE_EFFECT)
e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE+EFFECT_FLAG_CLIENT_HINT) e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
e1:SetCondition(c51927075.indcon) e1:SetCondition(c51927075.indcon)
e1:SetValue(c51927075.efilter) e1:SetValue(c51927075.efilter)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
......
...@@ -128,7 +128,7 @@ function c60152902.e2opfilter(c) ...@@ -128,7 +128,7 @@ function c60152902.e2opfilter(c)
end end
function c60152902.e2tg(e,tp,eg,ep,ev,re,r,rp,chk) function c60152902.e2tg(e,tp,eg,ep,ev,re,r,rp,chk)
local p=PLAYER_ALL local p=PLAYER_ALL
if chk==0 then return not Duel.GetFlagEffect(1-tp,60152902)==0 end if chk==0 then return Duel.GetFlagEffect(1-tp,60152902)>0 end
Duel.SetTargetPlayer(p) Duel.SetTargetPlayer(p)
Duel.SetTargetParam(1000) Duel.SetTargetParam(1000)
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,p,1000) Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,p,1000)
......
...@@ -57,11 +57,9 @@ function c60152903.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,11 +57,9 @@ function c60152903.checkop(e,tp,eg,ep,ev,re,r,rp)
local c0,c1=Duel.GetBattleMonster(0) local c0,c1=Duel.GetBattleMonster(0)
if c60152903.check(c0) then if c60152903.check(c0) then
Duel.RegisterFlagEffect(0,60152903,RESET_PHASE+PHASE_END,0,1) Duel.RegisterFlagEffect(0,60152903,RESET_PHASE+PHASE_END,0,1)
Debug.Message(Duel.GetFlagEffect(tp,60152903))
end end
if c60152903.check(c1) then if c60152903.check(c1) then
Duel.RegisterFlagEffect(1,60152903,RESET_PHASE+PHASE_END,0,1) Duel.RegisterFlagEffect(1,60152903,RESET_PHASE+PHASE_END,0,1)
Debug.Message(Duel.GetFlagEffect(tp,60152903))
end end
end end
function c60152903.con(e,tp,eg,ep,ev,re,r,rp) function c60152903.con(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -12,6 +12,7 @@ function Auxiliary.PreloadUds() ...@@ -12,6 +12,7 @@ function Auxiliary.PreloadUds()
local _Group=tableclone(Group) local _Group=tableclone(Group)
EFFECT_FLAG_CANNOT_NEGATE=EFFECT_FLAG_CANNOT_NEGATE or 0x200 EFFECT_FLAG_CANNOT_NEGATE=EFFECT_FLAG_CANNOT_NEGATE or 0x200
EFFECT_FLAG_CAN_FORBIDDEN=EFFECT_FLAG_CAN_FORBIDDEN or 0x200
function require(str) function require(str)
require_list=require_list or {} require_list=require_list or {}
...@@ -123,6 +124,8 @@ function Auxiliary.PreloadUds() ...@@ -123,6 +124,8 @@ function Auxiliary.PreloadUds()
local _CRegisterEffect=Card.RegisterEffect local _CRegisterEffect=Card.RegisterEffect
function Card.RegisterEffect(c,e,...) function Card.RegisterEffect(c,e,...)
if aux.GetValueType(c)~="Card" then Debug.Message("Card.RegisterEffect没有输入正确的Card参数。") return end
if aux.GetValueType(e)~="Effect" then Debug.Message("Card.RegisterEffect没有输入正确的Effect参数。") return end
local eid=_CRegisterEffect(c,e,...) local eid=_CRegisterEffect(c,e,...)
effect_registered=effect_registered or {} effect_registered=effect_registered or {}
if e and eid then effect_registered[e]=true end if e and eid then effect_registered[e]=true end
...@@ -130,6 +133,7 @@ function Auxiliary.PreloadUds() ...@@ -130,6 +133,7 @@ function Auxiliary.PreloadUds()
end end
local _DRegisterEffect=Duel.RegisterEffect local _DRegisterEffect=Duel.RegisterEffect
function Duel.RegisterEffect(e,p,...) function Duel.RegisterEffect(e,p,...)
if aux.GetValueType(e)~="Effect" then Debug.Message("Duel.RegisterEffect没有输入正确的Effect参数。") return end
_DRegisterEffect(e,p,...) _DRegisterEffect(e,p,...)
effect_registered=effect_registered or {} effect_registered=effect_registered or {}
if e then effect_registered[e]=true end if e then effect_registered[e]=true 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