Commit 43069627 authored by Fluorohydride's avatar Fluorohydride

Merge pull request #536 from luffySAMA/master

fix
parents 24c216be ace23ada
...@@ -25,6 +25,7 @@ function c20368763.initial_effect(c) ...@@ -25,6 +25,7 @@ function c20368763.initial_effect(c)
e4:SetDescription(aux.Stringid(20368763,0)) e4:SetDescription(aux.Stringid(20368763,0))
e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN) e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e4:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
e4:SetCode(EVENT_RELEASE) e4:SetCode(EVENT_RELEASE)
e4:SetRange(LOCATION_MZONE) e4:SetRange(LOCATION_MZONE)
e4:SetCountLimit(1) e4:SetCountLimit(1)
...@@ -57,10 +58,10 @@ function c20368763.indcon(e) ...@@ -57,10 +58,10 @@ function c20368763.indcon(e)
return Duel.IsExistingMatchingCard(Card.IsType,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,TYPE_TOKEN) return Duel.IsExistingMatchingCard(Card.IsType,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,TYPE_TOKEN)
end end
function c20368763.cfilter(c,tp) function c20368763.cfilter(c,tp)
return c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp return c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp and c:IsReason(REASON_COST)
end end
function c20368763.spcon(e,tp,eg,ep,ev,re,r,rp) function c20368763.spcon(e,tp,eg,ep,ev,re,r,rp)
return re and re:GetHandler()~=e:GetHandler() and eg:IsExists(c20368763.cfilter,1,nil,tp) return re and re:GetHandler()~=e:GetHandler() and re:IsHasType(0x7f0) and eg:IsExists(c20368763.cfilter,1,nil,tp)
end end
function c20368763.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c20368763.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsRelateToEffect(e) end if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
......
--岩投げアタック --岩投げアタック
function c20781762.initial_effect(c) function c20781762.initial_effect(c)
--send to grave --send to grave
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(20781762,0)) e1:SetDescription(aux.Stringid(20781762,0))
e1:SetCategory(CATEGORY_DAMAGE) e1:SetCategory(CATEGORY_DAMAGE)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCost(c20781762.cost) e1:SetHintTiming(0,TIMING_END_PHASE)
e1:SetTarget(c20781762.target) e1:SetCost(c20781762.cost)
e1:SetOperation(c20781762.operation) e1:SetTarget(c20781762.target)
c:RegisterEffect(e1) e1:SetOperation(c20781762.operation)
end c:RegisterEffect(e1)
function c20781762.cfilter(c) end
return c:IsRace(RACE_ROCK) and c:IsAbleToGraveAsCost() function c20781762.cfilter(c)
end return c:IsRace(RACE_ROCK) and c:IsAbleToGraveAsCost()
function c20781762.cost(e,tp,eg,ep,ev,re,r,rp,chk) end
if chk==0 then return Duel.IsExistingMatchingCard(c20781762.cfilter,tp,LOCATION_DECK,0,1,nil) end function c20781762.cost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) if chk==0 then return Duel.IsExistingMatchingCard(c20781762.cfilter,tp,LOCATION_DECK,0,1,nil) end
local g=Duel.SelectMatchingCard(tp,c20781762.cfilter,tp,LOCATION_DECK,0,1,1,nil) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
Duel.SendtoGrave(g,REASON_COST) local g=Duel.SelectMatchingCard(tp,c20781762.cfilter,tp,LOCATION_DECK,0,1,1,nil)
end Duel.SendtoGrave(g,REASON_COST)
function c20781762.target(e,tp,eg,ep,ev,re,r,rp,chk) end
if chk==0 then return true end function c20781762.target(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetTargetPlayer(1-tp) if chk==0 then return true end
Duel.SetTargetParam(500) Duel.SetTargetPlayer(1-tp)
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,500) Duel.SetTargetParam(500)
end Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,500)
function c20781762.operation(e,tp,eg,ep,ev,re,r,rp) end
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) function c20781762.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.Damage(p,d,REASON_EFFECT) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
end Duel.Damage(p,d,REASON_EFFECT)
end
...@@ -10,11 +10,14 @@ function c36468556.initial_effect(c) ...@@ -10,11 +10,14 @@ function c36468556.initial_effect(c)
e1:SetOperation(c36468556.activate) e1:SetOperation(c36468556.activate)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c36468556.tgfilter(c)
return (c:IsFaceup() and c:IsType(TYPE_EFFECT)) or c:IsFacedown()
end
function c36468556.filter(c) function c36468556.filter(c)
return c:IsFaceup() and c:IsType(TYPE_EFFECT) return c:IsFaceup() and c:IsType(TYPE_EFFECT)
end end
function c36468556.target(e,tp,eg,ep,ev,re,r,rp,chk) function c36468556.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c36468556.tgfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
local dam=Duel.GetMatchingGroupCount(c36468556.filter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)*500 local dam=Duel.GetMatchingGroupCount(c36468556.filter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)*500
Duel.SetTargetPlayer(1-tp) Duel.SetTargetPlayer(1-tp)
Duel.SetTargetParam(dam) Duel.SetTargetParam(dam)
......
...@@ -18,10 +18,10 @@ function c40390147.spfilter(c,e,tp) ...@@ -18,10 +18,10 @@ function c40390147.spfilter(c,e,tp)
return c:IsCode(93717133) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsCode(93717133) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c40390147.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c40390147.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
local b1=Duel.IsExistingMatchingCard(c40390147.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) local b1=Duel.IsExistingMatchingCard(c40390147.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)
local b2=Duel.IsExistingMatchingCard(c40390147.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) local b2=Duel.IsExistingMatchingCard(c40390147.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp) and e:GetHandler():CheckRemoveOverlayCard(tp,2,REASON_COST)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and ((b1 and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST)) or (b2 and e:GetHandler():CheckRemoveOverlayCard(tp,2,REASON_COST))) end and (b1 or b2) end
if b1 and b2 then if b1 and b2 then
local opt=Duel.SelectOption(tp,aux.Stringid(40390147,1),aux.Stringid(40390147,2)) local opt=Duel.SelectOption(tp,aux.Stringid(40390147,1),aux.Stringid(40390147,2))
e:SetLabel(opt) e:SetLabel(opt)
......
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