Commit dd525f8a authored by wind2009's avatar wind2009

Fix

parent e59bbd72
...@@ -53,7 +53,7 @@ merge_databases: ...@@ -53,7 +53,7 @@ merge_databases:
FIELDS: 'name,desc,overallString,picUrl' FIELDS: 'name,desc,overallString,picUrl'
GIT_DEPTH: '1000' GIT_DEPTH: '1000'
OUTPUT_FILENAME: test-release.json OUTPUT_FILENAME: test-release.json
REF_COMMIT: '6.0' # 更新的时候改这里,修改成上一个tag的版本号 REF_COMMIT: '6.1' # 更新的时候改这里,修改成上一个tag的版本号
script: script:
- apt update;apt -y install wget - apt update;apt -y install wget
- currentPath=$PWD - currentPath=$PWD
......
...@@ -40,12 +40,6 @@ function s.initial_effect(c) ...@@ -40,12 +40,6 @@ function s.initial_effect(c)
end end
s.dark_calling=true s.dark_calling=true
s.material_setcode=0x8 s.material_setcode=0x8
function s.matfilter1(c)
return c:IsFusionCode(21844576,58932615) or c:IsHasEffect(EFFECT_FUSION_SUBSTITUTE)
end
function s.matfilter2(c)
return c:IsFusionSetCard(0x8)
end
function s.thfilter(c) function s.thfilter(c)
return (c:IsCode(94820406) or aux.IsCodeListed(c,94820406)) and c:IsAbleToHand() return (c:IsCode(94820406) or aux.IsCodeListed(c,94820406)) and c:IsAbleToHand()
and not c:IsType(TYPE_FUSION) and not c:IsType(TYPE_FUSION)
......
...@@ -38,21 +38,20 @@ function s.initial_effect(c) ...@@ -38,21 +38,20 @@ function s.initial_effect(c)
end end
s.dark_calling=true s.dark_calling=true
function s.matcheck(e,c) function s.matcheck(e,c)
local c=e:GetHandler() local ec=e:GetHandler()
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(ec)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetTargetRange(0,LOCATION_MZONE) e1:SetTargetRange(0,LOCATION_MZONE)
e1:SetValue(s.atkval) e1:SetValue(s.atkval)
e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD) e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
c:RegisterEffect(e1) ec:RegisterEffect(e1)
end end
function s.atkval(e,c) function s.atkval(e,c)
local ec=e:GetHandler() local ec=e:GetHandler()
local g=ec:GetMaterial() local g=ec:GetMaterial()
local mg=g:Filter(Card.IsType,nil,TYPE_MONSTER) local atk=g:GetSum(Card.GetTextAttack)
local atk=mg:GetSum(Card.GetBaseAttack)
return -atk return -atk
end end
function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -41,9 +41,9 @@ end ...@@ -41,9 +41,9 @@ end
function s.activate(e,tp,eg,ep,ev,re,r,rp) function s.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc then if tc then
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
if tc:IsAbleToHand() and (not tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or ft<=0 or Duel.SelectOption(tp,1190,1152)==0) then if tc:IsAbleToHand() and (not tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or ft<=0 or Duel.SelectOption(tp,1190,1152)==0) then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
......
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