diff --git a/c12081875.lua b/c12081875.lua index 1b6d19f18..d8dfafe84 100644 --- a/c12081875.lua +++ b/c12081875.lua @@ -29,7 +29,7 @@ function c12081875.effcon(e) end function c12081875.efffilter(c,e,tp,eg,ep,ev,re,r,rp) if not (c:IsSetCard(0x11c) and c:IsType(TYPE_MONSTER) and c:IsAbleToDeck() and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup())) then return false end - local te=c.discard_effect + local te=c.thunder_dragon_discard_effect if not te then return false end local tg=te:GetTarget() return not tg or tg and tg(e,tp,eg,ep,ev,re,r,rp,0) @@ -44,14 +44,14 @@ function c12081875.efftg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) Duel.ClearTargetCard() tc:CreateEffectRelation(e) e:SetLabelObject(tc) - local te=tc.discard_effect + local te=tc.thunder_dragon_discard_effect local tg=te:GetTarget() if tg then tg(e,tp,eg,ep,ev,re,r,rp,1) end end function c12081875.effop(e,tp,eg,ep,ev,re,r,rp) local tc=e:GetLabelObject() if tc:IsRelateToEffect(e) then - local te=tc.discard_effect + local te=tc.thunder_dragon_discard_effect local op=te:GetOperation() if op then op(e,tp,eg,ep,ev,re,r,rp) end Duel.BreakEffect() diff --git a/c20318029.lua b/c20318029.lua index 33e4ba62e..5e71d72d1 100644 --- a/c20318029.lua +++ b/c20318029.lua @@ -15,7 +15,7 @@ function c20318029.initial_effect(c) e1:SetTarget(c20318029.atktg) e1:SetOperation(c20318029.atkop) c:RegisterEffect(e1) - c20318029.discard_effect=e1 + c20318029.thunder_dragon_discard_effect=e1 --search local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(20318029,1)) diff --git a/c26400609.lua b/c26400609.lua index 272a32b19..4fbee7d05 100644 --- a/c26400609.lua +++ b/c26400609.lua @@ -45,7 +45,7 @@ function c26400609.initial_effect(c) e4:SetTarget(c26400609.thtg) e4:SetOperation(c26400609.thop) c:RegisterEffect(e4) - c26400609.Dragon_Ruler_handes_effect=e3 + c26400609.dragon_ruler_discard_effect=e3 end function c26400609.rfilter(c) return (c:IsRace(RACE_DRAGON) or c:IsAttribute(ATTRIBUTE_WATER)) and c:IsAbleToRemoveAsCost() diff --git a/c27268998.lua b/c27268998.lua index 2df696df9..c3bdba5b8 100644 --- a/c27268998.lua +++ b/c27268998.lua @@ -31,7 +31,7 @@ end function s.mfilter(ft,lv,race,att) return ft==1 and lv>=5 and bit.band(race,RACE_FIEND)==RACE_FIEND end -s.Metallization_material=s.mfilter +s.metalmorph_material=s.mfilter function s.setcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return not e:GetHandler():IsPublic() end end diff --git a/c27704731.lua b/c27704731.lua index b83c050b1..bb36ec04e 100644 --- a/c27704731.lua +++ b/c27704731.lua @@ -33,7 +33,7 @@ end function s.mfilter(ft,lv,race,att) return ft==1 and lv>=5 and race&RACE_WARRIOR~=0 end -s.Metallization_material=s.mfilter +s.metalmorph_material=s.mfilter function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return not e:GetHandler():IsPublic() end end diff --git a/c29596581.lua b/c29596581.lua index d6ef495fa..7ce8a481e 100644 --- a/c29596581.lua +++ b/c29596581.lua @@ -11,7 +11,7 @@ function c29596581.initial_effect(c) e1:SetTarget(c29596581.target) e1:SetOperation(c29596581.operation) c:RegisterEffect(e1) - c29596581.discard_effect=e1 + c29596581.thunder_dragon_discard_effect=e1 --spsummon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(29596581,1)) diff --git a/c31786629.lua b/c31786629.lua index 619b46f85..66600d7ea 100644 --- a/c31786629.lua +++ b/c31786629.lua @@ -10,7 +10,7 @@ function c31786629.initial_effect(c) e1:SetTarget(c31786629.target) e1:SetOperation(c31786629.operation) c:RegisterEffect(e1) - c31786629.discard_effect=e1 + c31786629.thunder_dragon_discard_effect=e1 end function c31786629.cost(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() diff --git a/c4965193.lua b/c4965193.lua index 9add4357c..4482d5edf 100644 --- a/c4965193.lua +++ b/c4965193.lua @@ -30,7 +30,7 @@ function s.initial_effect(c) end function s.efffilter(c,e,tp,eg,ep,ev,re,r,rp) if not (c:IsSetCard(0x1c4) and c:IsLevel(7) and c:IsAbleToGraveAsCost()) then return false end - local te=c.Dragon_Ruler_handes_effect + local te=c.dragon_ruler_discard_effect if not te then return false end local tg=te:GetTarget() return not tg or tg(e,tp,eg,ep,ev,re,r,rp,0,nil,c) @@ -44,7 +44,7 @@ function s.copytg(e,tp,eg,ep,ev,re,r,rp,chk) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local g=Duel.SelectMatchingCard(tp,s.efffilter,tp,LOCATION_DECK,0,1,1,nil,e,tp,eg,ep,ev,re,r,rp) local tc=g:GetFirst() - local te=tc.Dragon_Ruler_handes_effect + local te=tc.dragon_ruler_discard_effect Duel.SendtoGrave(g,REASON_COST) c:RemoveOverlayCard(tp,1,1,REASON_COST) e:SetProperty(te:GetProperty()) diff --git a/c53804307.lua b/c53804307.lua index 4b72c5f4b..5477df364 100644 --- a/c53804307.lua +++ b/c53804307.lua @@ -46,7 +46,7 @@ function c53804307.initial_effect(c) e4:SetTarget(c53804307.thtg) e4:SetOperation(c53804307.thop) c:RegisterEffect(e4) - c53804307.Dragon_Ruler_handes_effect=e3 + c53804307.dragon_ruler_discard_effect=e3 end function c53804307.rfilter(c) return (c:IsRace(RACE_DRAGON) or c:IsAttribute(ATTRIBUTE_FIRE)) and c:IsAbleToRemoveAsCost() diff --git a/c56713174.lua b/c56713174.lua index 4579672e7..808dd26e1 100644 --- a/c56713174.lua +++ b/c56713174.lua @@ -13,7 +13,7 @@ function c56713174.initial_effect(c) e1:SetTarget(c56713174.target) e1:SetOperation(c56713174.operation) c:RegisterEffect(e1) - c56713174.discard_effect=e1 + c56713174.thunder_dragon_discard_effect=e1 --search thunder dragon local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(56713174,1)) diff --git a/c80870883.lua b/c80870883.lua index 15e6e0d5e..10f081659 100644 --- a/c80870883.lua +++ b/c80870883.lua @@ -31,7 +31,7 @@ end function s.mfilter(ft,lv,race,att) return ft==1 and lv>=5 and bit.band(race,RACE_DRAGON)==RACE_DRAGON end -s.Metallization_material=s.mfilter +s.metalmorph_material=s.mfilter function s.setcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return not e:GetHandler():IsPublic() end end diff --git a/c83107873.lua b/c83107873.lua index e82997f71..102c0bf3e 100644 --- a/c83107873.lua +++ b/c83107873.lua @@ -11,7 +11,7 @@ function c83107873.initial_effect(c) e1:SetTarget(c83107873.target) e1:SetOperation(c83107873.operation) c:RegisterEffect(e1) - c83107873.discard_effect=e1 + c83107873.thunder_dragon_discard_effect=e1 --shuffle and draw local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(83107873,1)) diff --git a/c89399912.lua b/c89399912.lua index d4491d4ed..4d2eed069 100644 --- a/c89399912.lua +++ b/c89399912.lua @@ -45,7 +45,7 @@ function c89399912.initial_effect(c) e4:SetTarget(c89399912.thtg) e4:SetOperation(c89399912.thop) c:RegisterEffect(e4) - c89399912.Dragon_Ruler_handes_effect=e3 + c89399912.dragon_ruler_discard_effect=e3 end function c89399912.rfilter(c) return (c:IsRace(RACE_DRAGON) or c:IsAttribute(ATTRIBUTE_WIND)) and c:IsAbleToRemoveAsCost() diff --git a/c89812483.lua b/c89812483.lua index 64b6bd583..e4a40bf92 100644 --- a/c89812483.lua +++ b/c89812483.lua @@ -24,7 +24,7 @@ function s.filter1(c,e,tp) end function s.filter2(c,e,tp,ft,lv,race,att) if not (not c:IsSummonableCard() and aux.IsCodeListed(c,89812483) and c:IsType(TYPE_MONSTER)) then return false end - local proc=e:GetHandler():IsCode(id) and c.Metallization_material and c.Metallization_material(ft,lv,race,att) + local proc=e:GetHandler():IsCode(id) and c.metalmorph_material and c.metalmorph_material(ft,lv,race,att) return c:IsCanBeSpecialSummoned(e,0,tp,proc,proc,POS_FACEUP) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) @@ -49,7 +49,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter2),tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp,e:GetLabel()):GetFirst() if tc and Duel.SpecialSummon(tc,0,tp,tp,true,true,POS_FACEUP)>0 then - local proc=c:IsCode(id) and tc.Metallization_material and tc.Metallization_material(ft,lv,race,att) + local proc=c:IsCode(id) and tc.metalmorph_material and tc.metalmorph_material(ft,lv,race,att) if proc then tc:CompleteProcedure() end if ft==1 and c:IsOnField() and c:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then Duel.BreakEffect() diff --git a/c90411554.lua b/c90411554.lua index 51f99c48e..ca0823dbf 100644 --- a/c90411554.lua +++ b/c90411554.lua @@ -46,7 +46,7 @@ function c90411554.initial_effect(c) e4:SetTarget(c90411554.thtg) e4:SetOperation(c90411554.thop) c:RegisterEffect(e4) - c90411554.Dragon_Ruler_handes_effect=e3 + c90411554.dragon_ruler_discard_effect=e3 end function c90411554.rfilter(c) return (c:IsRace(RACE_DRAGON) or c:IsAttribute(ATTRIBUTE_EARTH)) and c:IsAbleToRemoveAsCost()