Skip to content

Y
ygopro-2pick
Commit f206bb83 authored by salix5's avatar salix5
Browse files
Options

EVENT_TO_GRAVE

parent 68d5ed5b
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 2 deletions
ocgcore/operations.cpp
View file @ f206bb83
...@@ -3368,7 +3368,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3 ...@@ -3368,7 +3368,7 @@ int32 field::send_to(uint16 step, group * targets, effect * reason_effect, uint3
todeck.insert(pcard); todeck.insert(pcard);
pcard->reset(RESET_TODECK, RESET_EVENT); pcard->reset(RESET_TODECK, RESET_EVENT);
raise_single_event(pcard, 0, EVENT_TO_DECK, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0); raise_single_event(pcard, 0, EVENT_TO_DECK, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
} else if(nloc == LOCATION_GRAVE) { } else if(nloc == LOCATION_GRAVE && !(pcard->current.reason & REASON_RETURN)) {
tograve.insert(pcard); tograve.insert(pcard);
pcard->reset(RESET_TOGRAVE, RESET_EVENT); pcard->reset(RESET_TOGRAVE, RESET_EVENT);
raise_single_event(pcard, 0, EVENT_TO_GRAVE, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0); raise_single_event(pcard, 0, EVENT_TO_GRAVE, pcard->current.reason_effect, pcard->current.reason, pcard->current.reason_player, 0, 0);
......
script/c57734012.lua
View file @ f206bb83
...@@ -71,6 +71,7 @@ function c57734012.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,6 +71,7 @@ function c57734012.activate(e,tp,eg,ep,ev,re,r,rp)
local g2=Duel.SelectMatchingCard(tp,c57734012.filter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc1,m.xyz_number) local g2=Duel.SelectMatchingCard(tp,c57734012.filter2,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,tc1,m.xyz_number)
local tc2=g2:GetFirst() local tc2=g2:GetFirst()
if tc2 then if tc2 then
Duel.BreakEffect()
tc2:SetMaterial(g1) tc2:SetMaterial(g1)
Duel.Overlay(tc2,g1) Duel.Overlay(tc2,g1)
Duel.SpecialSummon(tc2,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc2,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
......
script/constant.lua
View file @ f206bb83
...@@ -100,7 +100,7 @@ REASON_FLIP =0x2000 --翻转 ...@@ -100,7 +100,7 @@ REASON_FLIP =0x2000 --翻转
REASON_DISCARD =0x4000 --丢弃 REASON_DISCARD =0x4000 --丢弃
REASON_RDAMAGE =0x8000 --回復轉換後的傷害 REASON_RDAMAGE =0x8000 --回復轉換後的傷害
REASON_RRECOVER =0x10000 --傷害轉換後的回復 REASON_RRECOVER =0x10000 --傷害轉換後的回復
REASON_RETURN =0x20000 --回收 REASON_RETURN =0x20000 --回到墓地
REASON_FUSION =0x40000 --用於融合召喚 REASON_FUSION =0x40000 --用於融合召喚
REASON_SYNCHRO =0x80000 --用於同调召喚 REASON_SYNCHRO =0x80000 --用於同调召喚
REASON_RITUAL =0x100000 --用於仪式召喚 REASON_RITUAL =0x100000 --用於仪式召喚
......
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