Commit aa5f2945 authored by POLYMER's avatar POLYMER

fix

parent de5895b3
...@@ -91,10 +91,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,10 +91,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING) local b1=e:GetLabel()&(0x8-0x1)>0 and e:GetCode()==EVENT_CHAINING and Duel.IsChainNegatable(ev)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove() local b3=e:GetLabel()&(0x200-0x40)>0 and e:GetCode()==EVENT_CHAINING and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0 local b4=e:GetLabel()&(0x1000-0x200)>0 and e:GetCode()==EVENT_CHAINING
local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1) local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1)
local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
...@@ -130,7 +130,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -130,7 +130,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
off=off+1 off=off+1
end end
if b7 then if b7 then
ops[off]=aux.Stringid(m,1) ops[off]=aux.Stringid(9310055,1)
opval[off-1]=7 opval[off-1]=7
off=off+1 off=off+1
end end
......
...@@ -106,10 +106,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -106,10 +106,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING) local b1=e:GetLabel()&(0x8-0x1)>0 and e:GetCode()==EVENT_CHAINING and Duel.IsChainNegatable(ev)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove() local b3=e:GetLabel()&(0x200-0x40)>0 and e:GetCode()==EVENT_CHAINING and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0 local b4=e:GetLabel()&(0x1000-0x200)>0 and e:GetCode()==EVENT_CHAINING
local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1) local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1)
local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
...@@ -145,7 +145,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -145,7 +145,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
off=off+1 off=off+1
end end
if b7 then if b7 then
ops[off]=aux.Stringid(m,1) ops[off]=aux.Stringid(9310055,1)
opval[off-1]=7 opval[off-1]=7
off=off+1 off=off+1
end end
......
...@@ -125,10 +125,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -125,10 +125,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING) local b1=e:GetLabel()&(0x8-0x1)>0 and e:GetCode()==EVENT_CHAINING and Duel.IsChainNegatable(ev)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove() local b3=e:GetLabel()&(0x200-0x40)>0 and e:GetCode()==EVENT_CHAINING and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0 local b4=e:GetLabel()&(0x1000-0x200)>0 and e:GetCode()==EVENT_CHAINING
local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1) local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1)
local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
...@@ -164,7 +164,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -164,7 +164,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
off=off+1 off=off+1
end end
if b7 then if b7 then
ops[off]=aux.Stringid(m,1) ops[off]=aux.Stringid(9310055,1)
opval[off-1]=7 opval[off-1]=7
off=off+1 off=off+1
end end
......
...@@ -92,10 +92,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -92,10 +92,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING) local b1=e:GetLabel()&(0x8-0x1)>0 and e:GetCode()==EVENT_CHAINING and Duel.IsChainNegatable(ev)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove() local b3=e:GetLabel()&(0x200-0x40)>0 and e:GetCode()==EVENT_CHAINING and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0 local b4=e:GetLabel()&(0x1000-0x200)>0 and e:GetCode()==EVENT_CHAINING
local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1) local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1)
local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
...@@ -131,7 +131,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -131,7 +131,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
off=off+1 off=off+1
end end
if b7 then if b7 then
ops[off]=aux.Stringid(m,1) ops[off]=aux.Stringid(9310055,1)
opval[off-1]=7 opval[off-1]=7
off=off+1 off=off+1
end end
......
...@@ -123,10 +123,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -123,10 +123,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING) local b1=e:GetLabel()&(0x8-0x1)>0 and e:GetCode()==EVENT_CHAINING and Duel.IsChainNegatable(ev)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove() local b3=e:GetLabel()&(0x200-0x40)>0 and e:GetCode()==EVENT_CHAINING and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0 local b4=e:GetLabel()&(0x1000-0x200)>0 and e:GetCode()==EVENT_CHAINING
local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1) local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1)
local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
...@@ -162,7 +162,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -162,7 +162,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
off=off+1 off=off+1
end end
if b7 then if b7 then
ops[off]=aux.Stringid(m,1) ops[off]=aux.Stringid(9310055,1)
opval[off-1]=7 opval[off-1]=7
off=off+1 off=off+1
end end
......
...@@ -203,10 +203,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -203,10 +203,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING) local b1=e:GetLabel()&(0x8-0x1)>0 and e:GetCode()==EVENT_CHAINING and Duel.IsChainNegatable(ev)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove() local b3=e:GetLabel()&(0x200-0x40)>0 and e:GetCode()==EVENT_CHAINING and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0 local b4=e:GetLabel()&(0x1000-0x200)>0 and e:GetCode()==EVENT_CHAINING
local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1) local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1)
local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
...@@ -242,7 +242,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -242,7 +242,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
off=off+1 off=off+1
end end
if b7 then if b7 then
ops[off]=aux.Stringid(m,1) ops[off]=aux.Stringid(9310055,1)
opval[off-1]=7 opval[off-1]=7
off=off+1 off=off+1
end end
......
...@@ -184,7 +184,7 @@ function cm.LinkOperation(f,minc,maxc,gf) ...@@ -184,7 +184,7 @@ function cm.LinkOperation(f,minc,maxc,gf)
--e1:SetCondition(function(e) Debug.Message(oc:GetCode()) return true end) --e1:SetCondition(function(e) Debug.Message(oc:GetCode()) return true end)
e1:SetCost(function(e,tp,eg,ep,ev,re,r,rp,chk) e1:SetCost(function(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetLabelObject() local c=e:GetLabelObject()
if chk==0 then return eg:IsContains(c) and c:GetFlagEffectLabel(m) and c:GetFlagEffectLabel(m)==cid end if chk==0 then return c and eg:IsContains(c) and c:GetFlagEffectLabel(m) and c:GetFlagEffectLabel(m)==cid end
end) end)
if tg then e1:SetTarget(cm.btg(tg)) end if tg then e1:SetTarget(cm.btg(tg)) end
if op then e1:SetOperation(op) end if op then e1:SetOperation(op) end
......
...@@ -89,10 +89,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,10 +89,10 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1 local off=1
local ops={} local ops={}
local opval={} local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING) local b1=e:GetLabel()&(0x8-0x1)>0 and e:GetCode()==EVENT_CHAINING and Duel.IsChainNegatable(ev)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove() local b3=e:GetLabel()&(0x200-0x40)>0 and e:GetCode()==EVENT_CHAINING and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0 local b4=e:GetLabel()&(0x1000-0x200)>0 and e:GetCode()==EVENT_CHAINING
local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1) local b5=e:GetLabel()&(0x8000-0x1000)>0 and Duel.IsPlayerCanDraw(tp,1)
local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) local b6=e:GetLabel()&(0x40000-0x8000)>0 and Duel.IsExistingMatchingCard(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) local b7=e:GetLabel()&(0x200000-0x40000)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
...@@ -128,7 +128,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp) ...@@ -128,7 +128,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
off=off+1 off=off+1
end end
if b7 then if b7 then
ops[off]=aux.Stringid(m,1) ops[off]=aux.Stringid(9310055,1)
opval[off-1]=7 opval[off-1]=7
off=off+1 off=off+1
end 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