Commit fba46975 authored by VanillaSalt's avatar VanillaSalt

fix

parent df3f0499
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
int32 field::field_used_count[32] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5}; int32 field::field_used_count[32] = {0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5};
bool chain::chain_operation_sort(chain c1, chain c2) { bool chain::chain_operation_sort(const chain& c1, const chain& c2) {
return c1.triggering_effect->id < c2.triggering_effect->id; return c1.triggering_effect->id < c2.triggering_effect->id;
} }
bool tevent::operator< (const tevent& v) const { bool tevent::operator< (const tevent& v) const {
...@@ -34,7 +34,6 @@ field::field(duel* pduel) { ...@@ -34,7 +34,6 @@ field::field(duel* pduel) {
for (int i = 0; i < 2; ++i) { for (int i = 0; i < 2; ++i) {
cost[i].count = 0; cost[i].count = 0;
cost[i].amount = 0; cost[i].amount = 0;
cost[i].lpstack[i] = 0;
core.hint_timing[i] = 0; core.hint_timing[i] = 0;
player[i].lp = 8000; player[i].lp = 8000;
player[i].start_count = 5; player[i].start_count = 5;
......
...@@ -61,7 +61,7 @@ struct chain { ...@@ -61,7 +61,7 @@ struct chain {
tevent evt; tevent evt;
opmap opinfos; opmap opinfos;
uint32 flag; uint32 flag;
static bool chain_operation_sort(chain c1, chain c2); static bool chain_operation_sort(const chain& c1, const chain& c2);
}; };
struct player_info { struct player_info {
......
...@@ -79,7 +79,7 @@ function c47017574.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,7 +79,7 @@ function c47017574.disop(e,tp,eg,ep,ev,re,r,rp)
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER) e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY,2) e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
end end
tc=g:GetNext() tc=g:GetNext()
......
...@@ -47,7 +47,7 @@ function c52738610.thcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -47,7 +47,7 @@ function c52738610.thcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_EFFECT)~=0 return bit.band(r,REASON_EFFECT)~=0
end end
function c52738610.thfilter(c) function c52738610.thfilter(c)
return c:IsFaceup() and c:IsSetCard(0xb4) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and not c:IsCode(52738610) return c:IsFaceup() and c:IsSetCard(0xb4) and c:IsType(TYPE_MONSTER) and not c:IsCode(52738610) and c:IsAbleToHand()
end end
function c52738610.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c52738610.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c52738610.thfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c52738610.thfilter(chkc) end
......
...@@ -40,7 +40,7 @@ function c7165085.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -40,7 +40,7 @@ function c7165085.activate(e,tp,eg,ep,ev,re,r,rp)
local cost=te:GetCost() local cost=te:GetCost()
local target=te:GetTarget() local target=te:GetTarget()
local operation=te:GetOperation() local operation=te:GetOperation()
if te:GetCode()==EVENT_FREE_CHAIN and not (tc:IsStatus(STATUS_SET_TURN) and Duel.IsExistingMatchingCard(Card.IsCode,e:GetHandlerPlayer(),LOCATION_ONFIELD,0,1,nil,29762407)) if te:GetCode()==EVENT_FREE_CHAIN and te:IsActivatable(tp)
and (not condition or condition(te,tep,eg,ep,ev,re,r,rp)) and (not condition or condition(te,tep,eg,ep,ev,re,r,rp))
and (not cost or cost(te,tep,eg,ep,ev,re,r,rp,0)) and (not cost or cost(te,tep,eg,ep,ev,re,r,rp,0))
and (not target or target(te,tep,eg,ep,ev,re,r,rp,0)) then and (not target or target(te,tep,eg,ep,ev,re,r,rp,0)) then
......
...@@ -61,7 +61,7 @@ function c81146288.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,7 @@ function c81146288.disop(e,tp,eg,ep,ev,re,r,rp)
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE) e3:SetType(EFFECT_TYPE_SINGLE)
e3:SetCode(EFFECT_DISABLE_TRAPMONSTER) e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_STANDBY,2) e3:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e3) tc:RegisterEffect(e3)
end end
tc=g:GetNext() tc=g:GetNext()
......
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