Skip to content

Y
ygopro-scripts
Commit 5c3c232b authored by DailyShana's avatar DailyShana
Browse files
Options

revert & fix

parent e4bdb064
Hide whitespace changes
Inline Side-by-side
Showing with 16 additions and 24 deletions
c11317977.lua
View file @ 5c3c232b
...@@ -25,7 +25,7 @@ function c11317977.initial_effect(c) ...@@ -25,7 +25,7 @@ function c11317977.initial_effect(c)
e3:SetCategory(CATEGORY_TOHAND) e3:SetCategory(CATEGORY_TOHAND)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_TO_GRAVE) e3:SetCode(EVENT_BE_MATERIAL)
e3:SetCondition(c11317977.thcon2) e3:SetCondition(c11317977.thcon2)
e3:SetTarget(c11317977.thtg2) e3:SetTarget(c11317977.thtg2)
e3:SetOperation(c11317977.thop2) e3:SetOperation(c11317977.thop2)
...@@ -67,7 +67,7 @@ function c11317977.scop(e,tp,eg,ep,ev,re,r,rp) ...@@ -67,7 +67,7 @@ function c11317977.scop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c11317977.thcon2(e,tp,eg,ep,ev,re,r,rp) function c11317977.thcon2(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_MATERIAL+REASON_FUSION)==REASON_MATERIAL+REASON_FUSION return e:GetHandler():IsLocation(LOCATION_GRAVE) and r==REASON_FUSION
end end
function c11317977.thfilter2(c) function c11317977.thfilter2(c)
return c:IsSetCard(0xdf) and c:IsType(TYPE_MONSTER) and not c:IsCode(11317977) and c:IsAbleToHand() return c:IsSetCard(0xdf) and c:IsType(TYPE_MONSTER) and not c:IsCode(11317977) and c:IsAbleToHand()
......
c13241004.lua
View file @ 5c3c232b
...@@ -17,7 +17,7 @@ function c13241004.initial_effect(c) ...@@ -17,7 +17,7 @@ function c13241004.initial_effect(c)
e2:SetCategory(CATEGORY_DRAW+CATEGORY_HANDES) e2:SetCategory(CATEGORY_DRAW+CATEGORY_HANDES)
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_PLAYER_TARGET) e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_PLAYER_TARGET)
e2:SetCode(EVENT_TO_GRAVE) e2:SetCode(EVENT_BE_MATERIAL)
e2:SetCountLimit(1,13241004) e2:SetCountLimit(1,13241004)
e2:SetCondition(c13241004.drcon) e2:SetCondition(c13241004.drcon)
e2:SetTarget(c13241004.drtg) e2:SetTarget(c13241004.drtg)
...@@ -42,8 +42,7 @@ function c13241004.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -42,8 +42,7 @@ function c13241004.spop(e,tp,eg,ep,ev,re,r,rp)
end end
function c13241004.drcon(e,tp,eg,ep,ev,re,r,rp) function c13241004.drcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return bit.band(r,REASON_MATERIAL+REASON_FUSION)==REASON_MATERIAL+REASON_FUSION return c:IsLocation(LOCATION_GRAVE) and r==REASON_FUSION and c:GetReasonCard():IsSetCard(0xad)
and c:GetReasonCard():IsSetCard(0xad)
end end
function c13241004.drtg(e,tp,eg,ep,ev,re,r,rp,chk) function c13241004.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDraw(tp,2) end if chk==0 then return Duel.IsPlayerCanDraw(tp,2) end
......
c2729285.lua
View file @ 5c3c232b
...@@ -6,7 +6,7 @@ function c2729285.initial_effect(c) ...@@ -6,7 +6,7 @@ function c2729285.initial_effect(c)
e1:SetCategory(CATEGORY_TOHAND) e1:SetCategory(CATEGORY_TOHAND)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
e1:SetCode(EVENT_TO_GRAVE) e1:SetCode(EVENT_BE_MATERIAL)
e1:SetCountLimit(1,2729285) e1:SetCountLimit(1,2729285)
e1:SetCondition(c2729285.condition) e1:SetCondition(c2729285.condition)
e1:SetTarget(c2729285.target) e1:SetTarget(c2729285.target)
...@@ -14,7 +14,7 @@ function c2729285.initial_effect(c) ...@@ -14,7 +14,7 @@ function c2729285.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c2729285.condition(e,tp,eg,ep,ev,re,r,rp) function c2729285.condition(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_MATERIAL+REASON_FUSION)==REASON_MATERIAL+REASON_FUSION return e:GetHandler():IsLocation(LOCATION_GRAVE) and r==REASON_FUSION
end end
function c2729285.filter(c) function c2729285.filter(c)
return c:IsCode(24094653) and c:IsAbleToHand() return c:IsCode(24094653) and c:IsAbleToHand()
......
c38124994.lua
View file @ 5c3c232b
...@@ -6,7 +6,7 @@ function c38124994.initial_effect(c) ...@@ -6,7 +6,7 @@ function c38124994.initial_effect(c)
e1:SetCategory(CATEGORY_TOHAND) e1:SetCategory(CATEGORY_TOHAND)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
e1:SetCode(EVENT_TO_GRAVE) e1:SetCode(EVENT_BE_MATERIAL)
e1:SetCountLimit(1,38124994) e1:SetCountLimit(1,38124994)
e1:SetCondition(c38124994.condition) e1:SetCondition(c38124994.condition)
e1:SetTarget(c38124994.target) e1:SetTarget(c38124994.target)
...@@ -14,7 +14,7 @@ function c38124994.initial_effect(c) ...@@ -14,7 +14,7 @@ function c38124994.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c38124994.condition(e,tp,eg,ep,ev,re,r,rp) function c38124994.condition(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_MATERIAL+REASON_FUSION)==REASON_MATERIAL+REASON_FUSION return e:GetHandler():IsLocation(LOCATION_GRAVE) and r==REASON_FUSION
end end
function c38124994.filter(c) function c38124994.filter(c)
return (c:IsCode(30068120) or (c:IsSetCard(0xa9) and c:IsType(TYPE_MONSTER) and not c:IsCode(38124994))) return (c:IsCode(30068120) or (c:IsSetCard(0xa9) and c:IsType(TYPE_MONSTER) and not c:IsCode(38124994)))
......
c43268675.lua
View file @ 5c3c232b
...@@ -12,7 +12,7 @@ function c43268675.initial_effect(c) ...@@ -12,7 +12,7 @@ function c43268675.initial_effect(c)
--indes --indes
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetCode(EVENT_TO_GRAVE) e3:SetCode(EVENT_BE_MATERIAL)
e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
e3:SetCondition(c43268675.indcon) e3:SetCondition(c43268675.indcon)
e3:SetOperation(c43268675.indop) e3:SetOperation(c43268675.indop)
...@@ -26,7 +26,7 @@ function c43268675.atklimit(e,tp,eg,ep,ev,re,r,rp) ...@@ -26,7 +26,7 @@ function c43268675.atklimit(e,tp,eg,ep,ev,re,r,rp)
e:GetHandler():RegisterEffect(e1) e:GetHandler():RegisterEffect(e1)
end end
function c43268675.indcon(e,tp,eg,ep,ev,re,r,rp) function c43268675.indcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_MATERIAL+REASON_FUSION)==REASON_MATERIAL+REASON_FUSION return r==REASON_FUSION and e:GetHandler():IsLocation(LOCATION_GRAVE)
end end
function c43268675.indop(e,tp,eg,ep,ev,re,r,rp) function c43268675.indop(e,tp,eg,ep,ev,re,r,rp)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
......
c77565204.lua
View file @ 5c3c232b
...@@ -70,7 +70,7 @@ function c77565204.tgcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,7 +70,7 @@ function c77565204.tgcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()==tp and e:GetHandler():GetTurnCounter()==1 return Duel.GetTurnPlayer()==tp and e:GetHandler():GetTurnCounter()==1
end end
function c77565204.filter1(c,e) function c77565204.filter1(c,e)
return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToGrave() and not c:IsImmuneToEffect(e) return c:IsType(TYPE_MONSTER) and c:IsAbleToGrave() and not c:IsImmuneToEffect(e)
end end
function c77565204.filter2(c,m) function c77565204.filter2(c,m)
return c:IsFusionSummonableCard() and c:CheckFusionMaterial(m) return c:IsFusionSummonableCard() and c:CheckFusionMaterial(m)
...@@ -87,13 +87,7 @@ function c77565204.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -87,13 +87,7 @@ function c77565204.tgop(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
local code=tc:GetCode() local code=tc:GetCode()
local mat=Duel.SelectFusionMaterial(tp,tc,mg) local mat=Duel.SelectFusionMaterial(tp,tc,mg)
local fg=Duel.GetMatchingGroup(Card.IsCode,tp,LOCATION_EXTRA,0,nil,code) Duel.SendtoGrave(mat,REASON_EFFECT)
local tc=fg:GetFirst()
while tc do
tc:SetMaterial(mat)
tc=fg:GetNext()
end
Duel.SendtoGrave(mat,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION)
e:SetLabel(code) e:SetLabel(code)
end end
end end
......
c79757784.lua
View file @ 5c3c232b
...@@ -14,7 +14,7 @@ function c79757784.initial_effect(c) ...@@ -14,7 +14,7 @@ function c79757784.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetCategory(CATEGORY_DAMAGE+CATEGORY_ATKCHANGE) e2:SetCategory(CATEGORY_DAMAGE+CATEGORY_ATKCHANGE)
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_TO_GRAVE) e2:SetCode(EVENT_BE_MATERIAL)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
e2:SetCondition(c79757784.damcon) e2:SetCondition(c79757784.damcon)
e2:SetTarget(c79757784.damtg) e2:SetTarget(c79757784.damtg)
...@@ -43,7 +43,7 @@ function c79757784.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -43,7 +43,7 @@ function c79757784.thop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c79757784.damcon(e,tp,eg,ep,ev,re,r,rp) function c79757784.damcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_MATERIAL+REASON_FUSION)==REASON_MATERIAL+REASON_FUSION return r==REASON_FUSION and e:GetHandler():IsLocation(LOCATION_GRAVE)
end end
function c79757784.damtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c79757784.damtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c79757784.cfilter(chkc) end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c79757784.cfilter(chkc) end
......
c87246309.lua
View file @ 5c3c232b
...@@ -20,7 +20,7 @@ function c87246309.initial_effect(c) ...@@ -20,7 +20,7 @@ function c87246309.initial_effect(c)
e3:SetCategory(CATEGORY_TOGRAVE) e3:SetCategory(CATEGORY_TOGRAVE)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_TO_GRAVE) e3:SetCode(EVENT_BE_MATERIAL)
e3:SetCountLimit(1,87246310) e3:SetCountLimit(1,87246310)
e3:SetCondition(c87246309.tgcon) e3:SetCondition(c87246309.tgcon)
e3:SetTarget(c87246309.tgtg) e3:SetTarget(c87246309.tgtg)
...@@ -45,8 +45,7 @@ function c87246309.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -45,8 +45,7 @@ function c87246309.operation(e,tp,eg,ep,ev,re,r,rp)
end end
function c87246309.tgcon(e,tp,eg,ep,ev,re,r,rp) function c87246309.tgcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return bit.band(r,REASON_MATERIAL+REASON_FUSION)==REASON_MATERIAL+REASON_FUSION return c:IsLocation(LOCATION_GRAVE) and r==REASON_FUSION and c:GetReasonCard():IsSetCard(0xad)
and c:GetReasonCard():IsSetCard(0xad)
end end
function c87246309.tgfilter(c) function c87246309.tgfilter(c)
return c:IsFaceup() and c:IsType(TYPE_MONSTER) return c:IsFaceup() and c:IsType(TYPE_MONSTER)
......
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