Commit 37783c76 authored by nanahira's avatar nanahira

Merge branch 'master' of https://github.com/purerosefallen/Nanahira-Cards into rei

parents 3fd40089 8399b521
...@@ -20,9 +20,6 @@ build_script: ...@@ -20,9 +20,6 @@ build_script:
- cp -rf ../expansions/pics expansions - cp -rf ../expansions/pics expansions
- cp -rf ../expansions/script expansions - cp -rf ../expansions/script expansions
- cp -rf ../sound . - cp -rf ../sound .
- cd update
- update.exe -ci
- cd ..
- git add . -A - git add . -A
- git commit -m "Auto Push by Nanahira" - git commit -m "Auto Push by Nanahira"
...@@ -44,10 +41,6 @@ build_script: ...@@ -44,10 +41,6 @@ build_script:
- cp -rf ../expansions/script/c37564552.lua expansions/script - cp -rf ../expansions/script/c37564552.lua expansions/script
- cp -rf ../expansions/script/c37564765.lua expansions/script - cp -rf ../expansions/script/c37564765.lua expansions/script
- cp -rf ../expansions/script/c375649??.lua expansions/script - cp -rf ../expansions/script/c375649??.lua expansions/script
- cd update
- cp -rf ../../ygopro-222DIY/update/update.exe .
- update.exe -ci
- cd ..
- git add . -A - git add . -A
- git commit -m "Auto Push by Nanahira" - git commit -m "Auto Push by Nanahira"
- git push https://%AUTH_TOKEN%@github.com/YGOCC/Moon master - git push https://%AUTH_TOKEN%@github.com/YGOCC/Moon master
......
...@@ -10,11 +10,11 @@ function cm.filter(c,e,tp) ...@@ -10,11 +10,11 @@ function cm.filter(c,e,tp)
return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Senya.CheckPrism(c) return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Senya.CheckPrism(c)
end end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and cm.filter(chkc,e,tp) end if chkc then return chkc:IsLocation(LOCATION_GRAVE) and cm.filter(chkc,e,tp) and chkc:IsControler(tp) end
if chk==0 then return Duel.GetMZoneCount(tp)>0 if chk==0 then return Duel.GetMZoneCount(tp)>0
and Duel.IsExistingTarget(cm.filter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil,e,tp) end and Duel.IsExistingTarget(cm.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,1,nil,e,tp) local g=Duel.SelectTarget(tp,cm.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
end end
function cm.activate(e,tp,eg,ep,ev,re,r,rp) function cm.activate(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -19,6 +19,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -19,6 +19,5 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then if tc:IsRelateToEffect(e) then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc)
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