Commit 7ab64171 authored by argon.sun's avatar argon.sun

fix

parent aecf25f4
...@@ -688,7 +688,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) { ...@@ -688,7 +688,7 @@ bool SingleMode::SinglePlayAnalyze(char* msg, unsigned int len) {
memcpy(msgbuf, begin, len + 1); memcpy(msgbuf, begin, len + 1);
BufferIO::DecodeUTF8(msgbuf, msg); BufferIO::DecodeUTF8(msgbuf, msg);
mainGame->gMutex.Lock(); mainGame->gMutex.Lock();
mainGame->stMessage->setText(msg); mainGame->SetStaticText(mainGame->stMessage, 310, mainGame->textFont, msg);
mainGame->PopupElement(mainGame->wMessage); mainGame->PopupElement(mainGame->wMessage);
mainGame->gMutex.Unlock(); mainGame->gMutex.Unlock();
mainGame->actionSignal.Reset(); mainGame->actionSignal.Reset();
......
...@@ -3017,6 +3017,8 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3017,6 +3017,8 @@ int32 field::process_battle_command(uint16 step) {
} }
case 26: { case 26: {
uint32 aa = core.attacker->get_attack(), ad = core.attacker->get_defence(); uint32 aa = core.attacker->get_attack(), ad = core.attacker->get_defence();
core.attacker->q_cache.attack = aa;
core.attacker->q_cache.defence = ad;
uint32 da = 0, dd = 0, a = aa, d; uint32 da = 0, dd = 0, a = aa, d;
uint8 pa = core.attacker->current.controler, pd; uint8 pa = core.attacker->current.controler, pd;
uint8 damp = 0; uint8 damp = 0;
...@@ -3027,6 +3029,8 @@ int32 field::process_battle_command(uint16 step) { ...@@ -3027,6 +3029,8 @@ int32 field::process_battle_command(uint16 step) {
if(core.attack_target) { if(core.attack_target) {
da = core.attack_target->get_attack(); da = core.attack_target->get_attack();
dd = core.attack_target->get_defence(); dd = core.attack_target->get_defence();
core.attack_target->q_cache.attack = da;
core.attack_target->q_cache.defence = dd;
core.attack_target->set_status(STATUS_BATTLE_DESTROYED, FALSE); core.attack_target->set_status(STATUS_BATTLE_DESTROYED, FALSE);
pd = core.attack_target->current.controler; pd = core.attack_target->current.controler;
if(core.attack_target->is_position(POS_ATTACK)) { if(core.attack_target->is_position(POS_ATTACK)) {
......
...@@ -31,12 +31,12 @@ function c15629801.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -31,12 +31,12 @@ function c15629801.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummonStep(token,0,tp,tp,false,false,POS_FACEUP)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_ATTACK) e1:SetCode(EFFECT_SET_BASE_ATTACK)
e1:SetValue(tc:GetAttack()) e1:SetValue(tc:GetAttack())
e1:SetReset(RESET_EVENT+0x1fe0000) e1:SetReset(RESET_EVENT+0x1fe0000)
token:RegisterEffect(e1) token:RegisterEffect(e1)
local e2=e1:Clone() local e2=e1:Clone()
e2:SetCode(EFFECT_SET_DEFENCE) e2:SetCode(EFFECT_SET_BASE_DEFENCE)
e2:SetValue(tc:GetDefence()) e2:SetValue(tc:GetDefence())
token:RegisterEffect(e2) token:RegisterEffect(e2)
local e3=e1:Clone() local e3=e1:Clone()
......
...@@ -20,13 +20,13 @@ function c75417459.filter(c,e,tp) ...@@ -20,13 +20,13 @@ function c75417459.filter(c,e,tp)
end end
function c75417459.target(e,tp,eg,ep,ev,re,r,rp,chk) function c75417459.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1
and Duel.IsExistingMatchingCard(c75417459.filter,tp,LOCATION_HAND,0,1,nil,e,tp) end and Duel.IsExistingMatchingCard(c75417459.filter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_DECK)
end end
function c75417459.activate(e,tp,eg,ep,ev,re,r,rp) function c75417459.activate(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,c75417459.filter,tp,LOCATION_HAND,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,c75417459.filter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp)
if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,true,false,POS_FACEUP)>0 then if g:GetCount()>0 and Duel.SpecialSummon(g,0,tp,tp,true,false,POS_FACEUP)>0 then
g:GetFirst():CompleteProcedure() g:GetFirst():CompleteProcedure()
end end
......
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