Skip to content

Y
ygopro-pre-data
Commit 90f7a189 authored by mercury233's avatar mercury233
Browse files
Options

fix

parent 1b05ecfd
Hide whitespace changes
Inline Side-by-side
Showing with 26 additions and 27 deletions
script/c100200181.lua
View file @ 90f7a189
...@@ -27,7 +27,7 @@ function c100200181.initial_effect(c) ...@@ -27,7 +27,7 @@ function c100200181.initial_effect(c)
e3:SetCode(EVENT_FREE_CHAIN) e3:SetCode(EVENT_FREE_CHAIN)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP) e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
e3:SetRange(LOCATION_GRAVE) e3:SetRange(LOCATION_GRAVE)
e3:SetHintTiming(0,TIMING_ATTACK+TIMING_BATTLE_END) e3:SetHintTiming(TIMING_DAMAGE_STEP)
e3:SetCountLimit(1,100200281) e3:SetCountLimit(1,100200281)
e3:SetCondition(c100200181.atkcon) e3:SetCondition(c100200181.atkcon)
e3:SetCost(aux.bfgcost) e3:SetCost(aux.bfgcost)
......
script/c101012000.lua
View file @ 90f7a189
...@@ -16,13 +16,13 @@ function c101012000.initial_effect(c) ...@@ -16,13 +16,13 @@ function c101012000.initial_effect(c)
e1:SetOperation(c101012000.spop) e1:SetOperation(c101012000.spop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c101012000.spfilter2(c,tp) function c101012000.spfilter(c,tp)
return c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE) return c:GetPreviousControler()==tp and c:IsPreviousLocation(LOCATION_MZONE)
and c:IsPreviousPosition(POS_FACEUP) and c:IsReason(REASON_BATTLE+REASON_EFFECT) and not c:IsCode(101012000) and c:IsPreviousPosition(POS_FACEUP) and c:IsReason(REASON_BATTLE+REASON_EFFECT) and not c:IsCode(101012000)
and (c:GetPreviousAttributeOnField() & ATTRIBUTE_WATER) > 0 and (c:GetPreviousAttributeOnField()&ATTRIBUTE_WATER)>0
end end
function c101012000.spcon(e,tp,eg,ep,ev,re,r,rp) function c101012000.spcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c101012000.spfilter2,1,nil,tp) and not eg:IsContains(e:GetHandler()) return eg:IsExists(c101012000.spfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
end end
function c101012000.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c101012000.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -33,10 +33,11 @@ end ...@@ -33,10 +33,11 @@ end
function c101012000.spop(e,tp,eg,ep,ev,re,r,rp) function c101012000.spop(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
local ct=Duel.GetMatchingGroupCount(Card.IsAttribute,tp,LOCATION_GRAVE,0,nil,ATTRIBUTE_WATER)
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_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetValue(Duel.GetMatchingGroupCount(Card.IsAttribute,tp,LOCATION_GRAVE,0,nil,ATTRIBUTE_WATER) * 100) e1:SetValue(ct*100)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END,2) e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END,2)
c:RegisterEffect(e1) c:RegisterEffect(e1)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
......
script/c101012081.lua
View file @ 90f7a189
...@@ -36,8 +36,7 @@ function c101012081.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -36,8 +36,7 @@ function c101012081.spcon(e,tp,eg,ep,ev,re,r,rp)
end end
function c101012081.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c101012081.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
end end
function c101012081.spop(e,tp,eg,ep,ev,re,r,rp) function c101012081.spop(e,tp,eg,ep,ev,re,r,rp)
...@@ -57,7 +56,7 @@ function c101012081.thtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -57,7 +56,7 @@ function c101012081.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c101012081.thop(e,tp,eg,ep,ev,re,r,rp) function c101012081.thop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c and c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
Duel.SendtoHand(c,nil,REASON_EFFECT) Duel.SendtoHand(c,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,c) Duel.ConfirmCards(1-tp,c)
end end
......
script/c101012082.lua
View file @ 90f7a189
...@@ -33,19 +33,16 @@ function c101012082.spcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -33,19 +33,16 @@ function c101012082.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c101012082.cfilter,tp,LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c101012082.cfilter,tp,LOCATION_GRAVE,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectMatchingCard(tp,c101012082.cfilter,tp,LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c101012082.cfilter,tp,LOCATION_GRAVE,0,1,1,nil)
if #g>0 then Duel.Remove(g,POS_FACEUP,REASON_COST)
Duel.Remove(g,POS_FACEUP,REASON_COST)
end
end end
function c101012082.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c101012082.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
end end
function c101012082.spop(e,tp,eg,ep,ev,re,r,rp) function c101012082.spop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c and c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end end
end end
......
script/c101012084.lua
View file @ 90f7a189
...@@ -8,7 +8,7 @@ function c101012084.initial_effect(c) ...@@ -8,7 +8,7 @@ function c101012084.initial_effect(c)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET) e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCountLimit(1,101012084) e1:SetCountLimit(1,101012084+EFFECT_COUNT_CODE_OATH)
e1:SetTarget(c101012084.target) e1:SetTarget(c101012084.target)
e1:SetOperation(c101012084.activate) e1:SetOperation(c101012084.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -24,10 +24,10 @@ end ...@@ -24,10 +24,10 @@ end
function c101012084.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c101012084.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp)
and chkc:IsType(TYPE_MONSTER) and chkc:IsLevelBelow(4) end and chkc:IsType(TYPE_MONSTER) and chkc:IsLevelBelow(4) end
local b=e:IsHasType(EFFECT_TYPE_ACTIVATE) and not e:GetHandler():IsLocation(LOCATION_SZONE) local ft=1
if e:IsHasType(EFFECT_TYPE_ACTIVATE) and not e:GetHandler():IsLocation(LOCATION_SZONE) then ft=2 end
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and (b and Duel.GetLocationCount(tp,LOCATION_SZONE)>1 and Duel.GetLocationCount(tp,LOCATION_SZONE)>=ft
or not b and Duel.GetLocationCount(tp,LOCATION_SZONE)>0)
and Duel.IsExistingTarget(c101012084.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end and Duel.IsExistingTarget(c101012084.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
local g=Duel.SelectTarget(tp,c101012084.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) local g=Duel.SelectTarget(tp,c101012084.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
......
script/c101012086.lua
View file @ 90f7a189
...@@ -26,13 +26,13 @@ function c101012086.initial_effect(c) ...@@ -26,13 +26,13 @@ function c101012086.initial_effect(c)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c101012086.cfilter(c,tp) function c101012086.cfilter(c,tp)
return c:IsAbleToGraveAsCost() and c:IsSetCard(0x13f) and c:IsType(TYPE_MONSTER) return c:IsAbleToGraveAsCost() and c:IsSetCard(0x13f) and c:GetOriginalType()&TYPE_MONSTER~=0
and (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and Duel.GetMZoneCount(tp,c)>0 and (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and Duel.GetMZoneCount(tp,c)>0
end end
function c101012086.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function c101012086.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c101012086.cfilter,tp,LOCATION_MZONE+LOCATION_HAND,0,1,e:GetHandler(),tp) end if chk==0 then return Duel.IsExistingMatchingCard(c101012086.cfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,e:GetHandler(),tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=Duel.SelectMatchingCard(tp,c101012086.cfilter,tp,LOCATION_MZONE+LOCATION_HAND,0,1,1,e:GetHandler(),tp) local g=Duel.SelectMatchingCard(tp,c101012086.cfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,1,e:GetHandler(),tp)
Duel.SendtoGrave(g,REASON_COST) Duel.SendtoGrave(g,REASON_COST)
end end
function c101012086.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c101012086.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
...@@ -58,7 +58,7 @@ function c101012086.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,7 +58,7 @@ function c101012086.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON) e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
......
script/c101012087.lua
View file @ 90f7a189
...@@ -81,7 +81,6 @@ function c101012087.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -81,7 +81,6 @@ function c101012087.disop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re)
and Duel.Destroy(eg,REASON_EFFECT)>0 and c:IsRelateToEffect(e) and Duel.Destroy(eg,REASON_EFFECT)>0 and c:IsRelateToEffect(e)
and c:GetEquipGroup()
and c:GetEquipGroup():IsExists(c101012087.eqfilter,1,nil) and c:GetEquipGroup():IsExists(c101012087.eqfilter,1,nil)
and Duel.IsExistingMatchingCard(c101012087.thfilter,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(c101012087.thfilter,tp,LOCATION_DECK,0,1,nil)
and Duel.SelectYesNo(tp,aux.Stringid(101012087,2)) then and Duel.SelectYesNo(tp,aux.Stringid(101012087,2)) then
......
script/c101012090.lua
View file @ 90f7a189
...@@ -66,7 +66,8 @@ function c101012090.cfilter(c) ...@@ -66,7 +66,8 @@ function c101012090.cfilter(c)
return c:IsFaceup() and c:IsSetCard(0x13f) return c:IsFaceup() and c:IsSetCard(0x13f)
end end
function c101012090.tgcond(e,tp,eg,ep,ev,re,r,rp) function c101012090.tgcond(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c101012090.cfilter,tp,LOCATION_MZONE,0,1,nil) return e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)
and Duel.IsExistingMatchingCard(c101012090.cfilter,tp,LOCATION_MZONE,0,1,nil)
end end
function c101012090.tgcost(e,tp,eg,ep,ev,re,r,rp,chk) function c101012090.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
...@@ -74,10 +75,11 @@ function c101012090.tgcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -74,10 +75,11 @@ function c101012090.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c101012090.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) function c101012090.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDraw(1-tp,1) end if chk==0 then return Duel.IsPlayerCanDraw(1-tp,1) end
Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
Duel.SetTargetPlayer(1-tp) Duel.SetTargetPlayer(1-tp)
Duel.SetTargetParam(1) Duel.SetTargetParam(1)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,1,1-tp,1) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,1-tp,1)
Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,1,1-tp,1) Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,1-tp,1)
end end
function c101012090.tgfilter1(c) function c101012090.tgfilter1(c)
return c:IsType(TYPE_MONSTER) and c:IsAbleToGrave() return c:IsType(TYPE_MONSTER) and c:IsAbleToGrave()
...@@ -100,6 +102,7 @@ function c101012090.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -100,6 +102,7 @@ function c101012090.tgop(e,tp,eg,ep,ev,re,r,rp)
end end
function c101012090.tgtg2(e,tp,eg,ep,ev,re,r,rp,chk) function c101012090.tgtg2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGrave,1-tp,LOCATION_EXTRA,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGrave,1-tp,LOCATION_EXTRA,0,1,nil) end
Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,1-tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,1-tp,LOCATION_EXTRA)
end end
function c101012090.tgop2(e,tp,eg,ep,ev,re,r,rp) function c101012090.tgop2(e,tp,eg,ep,ev,re,r,rp)
......
script/c101012091.lua
View file @ 90f7a189
...@@ -78,7 +78,7 @@ end ...@@ -78,7 +78,7 @@ end
function c101012091.eqop(e,tp,eg,ep,ev,re,r,rp) function c101012091.eqop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if Duel.GetLocationCount(tp,LOCATION_SZONE)<1 then return end if Duel.GetLocationCount(tp,LOCATION_SZONE)<1 then return end
if c:IsForbidden() or not c:CheckUniqueOnField(tp,LOCATION_SZONE) then return end if not c:IsRelateToEffect(e) or c:IsForbidden() or not c:CheckUniqueOnField(tp,LOCATION_SZONE) then return end
local g=eg:Filter(c101012091.exfilter,nil,tp) local g=eg:Filter(c101012091.exfilter,nil,tp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
local sg=Duel.SelectMatchingCard(tp,c101012091.eqfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,g) local sg=Duel.SelectMatchingCard(tp,c101012091.eqfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,g)
......
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