Commit 875b0a5a authored by argon.sun's avatar argon.sun

fix

parent 4d712820
...@@ -67,7 +67,7 @@ using namespace io; ...@@ -67,7 +67,7 @@ using namespace io;
using namespace gui; using namespace gui;
extern const unsigned short PRO_VERSION; extern const unsigned short PRO_VERSION;
extern bool enable_log; extern int enable_log;
extern bool exit_on_return; extern bool exit_on_return;
#endif #endif
...@@ -709,7 +709,7 @@ void Game::SaveConfig() { ...@@ -709,7 +709,7 @@ void Game::SaveConfig() {
char linebuf[256]; char linebuf[256];
fprintf(fp, "use_d3d = %d\n", gameConf.use_d3d ? 1 : 0); fprintf(fp, "use_d3d = %d\n", gameConf.use_d3d ? 1 : 0);
fprintf(fp, "antialias = %d\n", gameConf.antialias); fprintf(fp, "antialias = %d\n", gameConf.antialias);
fprintf(fp, "errorlog = %d\n", enable_log ? 1 : 0); fprintf(fp, "errorlog = %d\n", enable_log);
BufferIO::CopyWStr(ebNickName->getText(), gameConf.nickname, 20); BufferIO::CopyWStr(ebNickName->getText(), gameConf.nickname, 20);
BufferIO::EncodeUTF8(gameConf.nickname, linebuf); BufferIO::EncodeUTF8(gameConf.nickname, linebuf);
fprintf(fp, "nickname = %s\n", linebuf); fprintf(fp, "nickname = %s\n", linebuf);
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#include "game.h" #include "game.h"
#include <event2/thread.h> #include <event2/thread.h>
bool enable_log = false; int enable_log = 0;
bool exit_on_return = false; bool exit_on_return = false;
int main(int argc, char* argv[]) { int main(int argc, char* argv[]) {
......
...@@ -95,10 +95,10 @@ function c11502550.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -95,10 +95,10 @@ function c11502550.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c11502550.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c11502550.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c11502550.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c11502550.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c11502550.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c11502550.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -103,10 +103,10 @@ function c17032740.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -103,10 +103,10 @@ function c17032740.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c17032740.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c17032740.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c17032740.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c17032740.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c17032740.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c17032740.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -26,7 +26,7 @@ end ...@@ -26,7 +26,7 @@ end
function c19594506.operation(e,tp,eg,ep,ev,re,r,rp,chk) function c19594506.operation(e,tp,eg,ep,ev,re,r,rp,chk)
local tc=Duel.GetFirstMatchingCard(c19594506.filter,tp,LOCATION_DECK,0,nil) local tc=Duel.GetFirstMatchingCard(c19594506.filter,tp,LOCATION_DECK,0,nil)
if tc then if tc then
Duel.SendtoHand(tg,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
end end
end end
...@@ -28,6 +28,7 @@ end ...@@ -28,6 +28,7 @@ end
function c19665973.operation(e,tp,eg,ep,ev,re,r,rp) function c19665973.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then if c:IsRelateToEffect(e) and Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)>0 then
Duel.BreakEffect()
Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1) Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
...@@ -10,7 +10,7 @@ function c213326.initial_effect(c) ...@@ -10,7 +10,7 @@ function c213326.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c213326.filter(c) function c213326.filter(c)
return c:IsSetCard(0x3008) and c:IsAbleToHand() return c:IsSetCard(0x3008) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
end end
function c213326.target(e,tp,eg,ep,ev,re,r,rp,chk) function c213326.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c213326.filter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c213326.filter,tp,LOCATION_DECK,0,1,nil) end
......
...@@ -98,10 +98,10 @@ function c28677304.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -98,10 +98,10 @@ function c28677304.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c28677304.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c28677304.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c28677304.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c28677304.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c28677304.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c28677304.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -4,7 +4,7 @@ function c39672388.initial_effect(c) ...@@ -4,7 +4,7 @@ function c39672388.initial_effect(c)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(39672388,0)) e1:SetDescription(aux.Stringid(39672388,0))
e1:SetCategory(CATEGORY_DESTROY) e1:SetCategory(CATEGORY_DESTROY)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET) e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetCode(EVENT_SPSUMMON_SUCCESS)
e1:SetCondition(c39672388.lvcon) e1:SetCondition(c39672388.lvcon)
...@@ -21,7 +21,7 @@ function c39672388.filter(c) ...@@ -21,7 +21,7 @@ function c39672388.filter(c)
end end
function c39672388.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c39672388.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and c39672388.filter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and c39672388.filter(chkc) end
if chk==0 then return true end if chk==0 then return Duel.IsExistingMatchingCard(c39672388.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
Duel.SelectTarget(tp,c39672388.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) Duel.SelectTarget(tp,c39672388.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
end end
......
...@@ -18,7 +18,7 @@ function c40044918.ctfilter(c) ...@@ -18,7 +18,7 @@ function c40044918.ctfilter(c)
return c:IsFaceup() and c:IsSetCard(0x8) return c:IsFaceup() and c:IsSetCard(0x8)
end end
function c40044918.schfilter(c) function c40044918.schfilter(c)
return c:IsSetCard(0x8) and c:IsAbleToHand() return c:IsSetCard(0x8) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
end end
function c40044918.desfilter(c) function c40044918.desfilter(c)
return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDestructable() return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDestructable()
......
...@@ -17,12 +17,11 @@ function c42015635.initial_effect(c) ...@@ -17,12 +17,11 @@ function c42015635.initial_effect(c)
--Def --Def
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e3:SetCode(42015635) e3:SetCode(42015635)
e3:SetRange(LOCATION_SZONE) e3:SetRange(LOCATION_SZONE)
e3:SetTargetRange(1,1) e3:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c42015635.atktg(e,c) function c42015635.atktg(e,c)
return c:IsSetCard(0x9) and c:IsType(TYPE_FUSION) and not c:IsCode(31111109) return c:GetCode()==89943723 or (c:IsSetCard(0x9) and c:IsType(TYPE_FUSION) and not c:IsCode(31111109))
end end
...@@ -98,10 +98,10 @@ function c48996569.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -98,10 +98,10 @@ function c48996569.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c48996569.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c48996569.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c48996569.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c48996569.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c48996569.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c48996569.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -111,10 +111,10 @@ function c49352945.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -111,10 +111,10 @@ function c49352945.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c49352945.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c49352945.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c49352945.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c49352945.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c49352945.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c49352945.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -99,10 +99,10 @@ function c55171412.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -99,10 +99,10 @@ function c55171412.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c55171412.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c55171412.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c55171412.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c55171412.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c55171412.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c55171412.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -112,10 +112,10 @@ function c78512663.atkval(e,c) ...@@ -112,10 +112,10 @@ function c78512663.atkval(e,c)
return Duel.GetFieldGroupCount(0,LOCATION_ONFIELD,LOCATION_ONFIELD)*400 return Duel.GetFieldGroupCount(0,LOCATION_ONFIELD,LOCATION_ONFIELD)*400
end end
function c78512663.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c78512663.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c78512663.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c78512663.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c78512663.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c78512663.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -95,10 +95,10 @@ function c81566151.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -95,10 +95,10 @@ function c81566151.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c81566151.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c81566151.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c81566151.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c81566151.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c81566151.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c81566151.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -5,10 +5,14 @@ function c82639107.initial_effect(c) ...@@ -5,10 +5,14 @@ function c82639107.initial_effect(c)
e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_DRAW) e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_DRAW)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCondition(c82639107.condition)
e1:SetTarget(c82639107.target) e1:SetTarget(c82639107.target)
e1:SetOperation(c82639107.activate) e1:SetOperation(c82639107.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c82639107.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0
end
function c82639107.filter(c) function c82639107.filter(c)
return c:IsSetCard(0x1f) and c:IsAbleToGrave() return c:IsSetCard(0x1f) and c:IsAbleToGrave()
end end
......
...@@ -99,10 +99,10 @@ function c85507811.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -99,10 +99,10 @@ function c85507811.spop(e,tp,eg,ep,ev,re,r,rp,c)
Duel.SendtoDeck(g,nil,2,REASON_COST) Duel.SendtoDeck(g,nil,2,REASON_COST)
end end
function c85507811.retcon1(e,tp,eg,ep,ev,re,r,rp,chk) function c85507811.retcon1(e,tp,eg,ep,ev,re,r,rp,chk)
return not Duel.IsPlayerAffectedByEffect(tp,42015635) return not e:GetHandler():IsHasEffect(42015635)
end end
function c85507811.retcon2(e,tp,eg,ep,ev,re,r,rp,chk) function c85507811.retcon2(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsPlayerAffectedByEffect(tp,42015635) return e:GetHandler():IsHasEffect(42015635)
end end
function c85507811.rettg(e,tp,eg,ep,ev,re,r,rp,chk) function c85507811.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToExtra() end if chk==0 then return e:GetHandler():IsAbleToExtra() end
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
#nickname & gamename should be less than 20 characters #nickname & gamename should be less than 20 characters
use_d3d = 0 use_d3d = 0
antialias = 2 antialias = 2
errorlog = 0 errorlog = 1
nickname = Player nickname = Player
gamename = Game gamename = Game
lastdeck = test lastdeck = test
......
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