Commit 47530d68 authored by VanillaSalt's avatar VanillaSalt

fix

parent 73f8d03d
......@@ -1616,7 +1616,7 @@ int32 field::check_tuner_material(card* pcard, card* tuner, int32 findex1, int32
if(smat) {
if(pcheck)
pcheck->get_value(smat);
if(!pduel->lua->check_matching(smat, findex2, 0)) {
if(!smat->is_position(POS_FACEUP) || !smat->is_can_be_synchro_material(pcard, tuner) || !pduel->lua->check_matching(smat, findex2, 0)) {
pduel->restore_assumes();
return FALSE;
}
......
......@@ -3873,6 +3873,8 @@ int32 field::select_synchro_material(int16 step, uint8 playerid, card* pcard, in
int32 lv = pcard->get_level();
lv -= l1;
if(smat) {
if(pcheck)
pcheck->get_value(smat);
l = smat->get_synchro_level(pcard);
l1 = l & 0xffff;
lv -= l1;
......
......@@ -39,7 +39,7 @@ function c77783947.sccon(e,tp,eg,ep,ev,re,r,rp)
return ph==PHASE_MAIN1 or ph==PHASE_BATTLE or ph==PHASE_MAIN2
end
function c77783947.mfilter(c)
return c:IsFaceup() and c:IsSetCard(0x9e)
return c:IsSetCard(0x9e)
end
function c77783947.cfilter(c,syn)
return syn:IsSynchroSummonable(c)
......
......@@ -427,3 +427,4 @@
!counter 0x2d 指示物(踢火)
!counter 0x2e 鲨指示物
!counter 0x2f 南瓜指示物
!counter 0x30 ???指示物
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