Commit d4d7c177 authored by Tachibana's avatar Tachibana

12

parent 6339a591
...@@ -63,7 +63,7 @@ pack: ...@@ -63,7 +63,7 @@ pack:
- cd update - cd update
- ./update-server.sh - ./update-server.sh
- cd .. - cd ..
- 7z a -mx9 dist/archive/ygopro-222DIY-data.7z expansions update ygopro.exe - 7z a -mx9 dist/archive/ygopro-222DIY-data.7z expansions update
- 7z a -mx9 dist/archive/ygopro-222DIY-sound.7z sound - 7z a -mx9 dist/archive/ygopro-222DIY-sound.7z sound
- ls -1 | sed '/dist/d' | xargs -I {} mv {} dist/contents/ - ls -1 | sed '/dist/d' | xargs -I {} mv {} dist/contents/
artifacts: artifacts:
......
...@@ -131,7 +131,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -131,7 +131,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_PHASE+PHASE_END) e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp) Duel.RegisterEffect(e1,tp)
end end
function cm.filter(c,tp) function cm.ffilter(c,tp)
return c:IsControler(tp) and c:IsType(TYPE_MONSTER) return c:IsControler(tp) and c:IsType(TYPE_MONSTER)
end end
function cm.descon(e,tp,eg,ep,ev,re,r,rp) function cm.descon(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -38,7 +38,7 @@ function cm.initial_effect(c) ...@@ -38,7 +38,7 @@ function cm.initial_effect(c)
e2:SetCondition(cm.scon) e2:SetCondition(cm.scon)
e2:SetTarget(cm.rmtarget) e2:SetTarget(cm.rmtarget)
e2:SetTargetRange(0xff,0xff) e2:SetTargetRange(0xff,0xff)
e2:SetValue(LOCATION_DECKSHF) e2:SetValue(LOCATION_DECK)
c:RegisterEffect(e2) c:RegisterEffect(e2)
-- --
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
...@@ -46,7 +46,7 @@ function cm.initial_effect(c) ...@@ -46,7 +46,7 @@ function cm.initial_effect(c)
e3:SetCode(m) e3:SetCode(m)
e3:SetRange(LOCATION_SZONE) e3:SetRange(LOCATION_SZONE)
e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE) e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
e3:SetTargetRange(0xff,0xf) e3:SetTargetRange(0xff,0xff)
e3:SetCondition(cm.scon) e3:SetCondition(cm.scon)
e3:SetTarget(cm.checktg) e3:SetTarget(cm.checktg)
c:RegisterEffect(e3) c:RegisterEffect(e3)
...@@ -107,7 +107,6 @@ function cm.atktg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -107,7 +107,6 @@ function cm.atktg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function cm.atkop(e,tp,eg,ep,ev,re,r,rp) function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if not c:IsRelateToEffect(e) then return end
local g=Duel.GetMatchingGroup(cm.apfilter,tp,LOCATION_MZONE,0,nil) local g=Duel.GetMatchingGroup(cm.apfilter,tp,LOCATION_MZONE,0,nil)
for tc in aux.Next(g) do for tc in aux.Next(g) do
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
...@@ -64,13 +64,11 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,13 +64,11 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp)
local sg=tg:Filter(Card.IsAbleToHand,nil) local sg=tg:Filter(Card.IsAbleToHand,nil)
if sg:GetCount()>0 then if sg:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local tg=sg:Select(tp,1,1,nil) local tg=sg:RandomSelect(tp,1)
local tc=tg:GetFirst() local tc=tg:GetFirst()
tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD-RESET_TOHAND,0,0) tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD-RESET_TOHAND,0,0)
Duel.SendtoHand(tc,tp,REASON_EFFECT) Duel.SendtoHand(tc,tp,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
--tc:ResetEffect(EVENT_CUSTOM+m,RESET_EVENT)
--Debug.Message(tc:GetFlagEffect(m))
end end
end end
function cm.tdop(e,tp,eg,ep,ev,re,r,rp) function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
......
File deleted
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