Commit b6da4c62 authored by POLYMER's avatar POLYMER

fix

parent 319d492c
...@@ -108,6 +108,6 @@ function s.e2op(e,tp,eg,ep,ev,re,r,rp) ...@@ -108,6 +108,6 @@ function s.e2op(e,tp,eg,ep,ev,re,r,rp)
local tg=Duel.GetMatchingGroup(s.e2confilter,tp,LOCATION_MZONE,0,nil) local tg=Duel.GetMatchingGroup(s.e2confilter,tp,LOCATION_MZONE,0,nil)
local g=Duel.GetDecktopGroup(1-tp,tg:GetCount()) local g=Duel.GetDecktopGroup(1-tp,tg:GetCount())
Duel.DisableShuffleCheck() Duel.DisableShuffleCheck()
Duel.Remove(g,POS_FACEUP,REASON_EFFECT) Duel.Remove(g,POS_DEFENSE,REASON_EFFECT)
end end
end end
...@@ -20,7 +20,7 @@ function cm.initial_effect(c) ...@@ -20,7 +20,7 @@ function cm.initial_effect(c)
e2:SetDescription(aux.Stringid(m,1)) e2:SetDescription(aux.Stringid(m,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetType(EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_PHASE+PHASE_STANDBY) e2:SetCode(EVENT_PHASE+PHASE_STANDBY)
e2:SetRange(LOCATION_SZONE) e2:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1) e2:SetCountLimit(1)
......
...@@ -53,18 +53,18 @@ function cm.initial_effect(c) ...@@ -53,18 +53,18 @@ function cm.initial_effect(c)
local e6=Effect.CreateEffect(c) local e6=Effect.CreateEffect(c)
e6:SetDescription(aux.Stringid(m,1)) e6:SetDescription(aux.Stringid(m,1))
e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e6:SetCode(EVENT_BATTLE_DESTROYED) e6:SetCode(EVENT_BATTLE_DAMAGE)
e6:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP) e6:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
e6:SetRange(LOCATION_FZONE) e6:SetRange(LOCATION_FZONE)
--e6:SetHintTiming(0,TIMING_BATTLE_START+TIMING_BATTLE_END) --e6:SetHintTiming(0,TIMING_BATTLE_START+TIMING_BATTLE_END)
e6:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE) e6:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
e6:SetCondition(cm.thcon) --e6:SetCondition(cm.thcon)
e6:SetTarget(cm.thtg) e6:SetTarget(cm.thtg)
e6:SetOperation(cm.thop) e6:SetOperation(cm.thop)
c:RegisterEffect(e6) c:RegisterEffect(e6)
local e7=e6:Clone() local e7=e6:Clone()
e7:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e7:SetCondition(cm.thcon)
e7:SetCode(EVENT_BATTLE_DAMAGE) e7:SetCode(EVENT_BATTLE_DESTROYED)
c:RegisterEffect(e7) c:RegisterEffect(e7)
end end
function cm.blazed(c) function cm.blazed(c)
...@@ -111,11 +111,11 @@ function cm.datg(e,c) ...@@ -111,11 +111,11 @@ function cm.datg(e,c)
return cm.blazed(c) return cm.blazed(c)
end end
function cm.cfilter(c) function cm.cfilter(c)
return c:IsFaceup() and cm.blazed(c) return c:IsType(TYPE_MONSTER) or c:IsPreviousLocation(LOCATION_MZONE)
end end
function cm.thcon(e,tp,eg,ep,ev,re,r,rp) function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE and (Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 return eg:IsExists(cm.cfilter,1,nil,tp)
or Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil)) --Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE and (Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 or Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil))
end end
function cm.thfilter(c) function cm.thfilter(c)
return cm.blazed(c) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER) return cm.blazed(c) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
......
...@@ -20,17 +20,17 @@ function cm.initial_effect(c) ...@@ -20,17 +20,17 @@ function cm.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(m,1)) e2:SetDescription(aux.Stringid(m,1))
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_BATTLE_DESTROYED) e2:SetCode(EVENT_BATTLE_DAMAGE)
e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP) e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
e2:SetRange(LOCATION_GRAVE) e2:SetRange(LOCATION_GRAVE)
--e2:SetCountLimit(1) --e2:SetCountLimit(1)
e2:SetCondition(cm.hacon) --e2:SetCondition(cm.hacon)
e2:SetTarget(cm.hatg) e2:SetTarget(cm.hatg)
e2:SetOperation(cm.haop) e2:SetOperation(cm.haop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=e2:Clone() local e3=e2:Clone()
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetCondition(cm.hacon)
e2:SetCode(EVENT_BATTLE_DAMAGE) e3:SetCode(EVENT_BATTLE_DESTROYED)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function cm.blazed(c) function cm.blazed(c)
...@@ -121,11 +121,10 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -121,11 +121,10 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function cm.cfilter(c) function cm.cfilter(c)
return c:IsFaceup() and cm.blazed(c) return c:IsType(TYPE_MONSTER) or c:IsPreviousLocation(LOCATION_MZONE)
end end
function cm.hacon(e,tp,eg,ep,ev,re,r,rp) function cm.hacon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE and (Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 return eg:IsExists(cm.cfilter,1,nil,tp)
or Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil))
end end
function cm.hatg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.hatg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
......
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