From 00112762b6c5fb1d3accad8ccdae75dbac171624 Mon Sep 17 00:00:00 2001 From: Naim Date: Tue, 24 Jun 2025 07:23:11 -0300 Subject: [PATCH 1/4] v1 --- official/c25140659.lua | 16 +++++++--------- official/c2834264.lua | 19 ++++++++++--------- official/c30163008.lua | 16 +++++++++------- official/c33971095.lua | 15 +++++++++------ official/c34479658.lua | 3 +-- official/c34559295.lua | 5 +++-- official/c3779493.lua | 22 ++++++++++------------ official/c39581190.lua | 6 +++--- official/c40240595.lua | 6 +++--- official/c42713844.lua | 10 +++++----- official/c42925441.lua | 1 - official/c44221928.lua | 2 +- official/c44373896.lua | 9 +++++---- official/c46660187.lua | 5 +++-- official/c47556396.lua | 8 ++++---- official/c54734082.lua | 14 ++++++-------- official/c5697558.lua | 12 +++++------- official/c5779502.lua | 2 +- 18 files changed, 85 insertions(+), 86 deletions(-) diff --git a/official/c25140659.lua b/official/c25140659.lua index 88a92aee9c..549b2a79a1 100644 --- a/official/c25140659.lua +++ b/official/c25140659.lua @@ -1,9 +1,10 @@ ---Danger! Response Team +--未界域調査報告 --Danger! Response Team local s,id=GetID() function s.initial_effect(c) - --Activate + --Return 1 "Danger!" monster you control and 1 monster on the field the the hand local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) @@ -12,10 +13,10 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.activate) c:RegisterEffect(e1) - --to deck and draw + --Place this card on the bottom of the Deck, then draw 1 card local e2=Effect.CreateEffect(c) - e2:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW) e2:SetDescription(aux.Stringid(id,1)) + e2:SetCategory(CATEGORY_TODECK+CATEGORY_DRAW) e2:SetType(EFFECT_TYPE_IGNITION) e2:SetRange(LOCATION_GRAVE) e2:SetCountLimit(1,{id,1}) @@ -27,10 +28,7 @@ end s.listed_series={SET_DANGER} function s.filter1(c,tp) return c:IsFaceup() and c:IsSetCard(SET_DANGER) and c:IsAbleToHand() - and Duel.IsExistingTarget(s.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,c) -end -function s.filter2(c) - return c:IsAbleToHand() + and Duel.IsExistingTarget(Card.IsAbleToHand,tp,LOCATION_MZONE,LOCATION_MZONE,1,c) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return false end @@ -38,7 +36,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND) local g1=Duel.SelectTarget(tp,s.filter1,tp,LOCATION_MZONE,0,1,1,nil,tp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND) - local g2=Duel.SelectTarget(tp,s.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,g1:GetFirst()) + local g2=Duel.SelectTarget(tp,Card.IsAbleToHand,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,g1:GetFirst()) g1:Merge(g2) Duel.SetOperationInfo(0,CATEGORY_TOHAND,g1,2,0,0) end diff --git a/official/c2834264.lua b/official/c2834264.lua index b373b2d554..134c1498ff 100644 --- a/official/c2834264.lua +++ b/official/c2834264.lua @@ -1,11 +1,11 @@ ---Beetrooper Armor Horn +--騎甲虫アームド・ホーン --Beetrooper Armor Horn local s,id=GetID() function s.initial_effect(c) - --link summon - c:EnableReviveLimit() Link.AddProcedure(c,aux.FilterBoolFunctionEx(Card.IsRace,RACE_INSECT),2,2) - --cannot special summon + --Link Summon procedure: 2 Insect monsters + c:EnableReviveLimit() + --You cannot Special Summon monsters, except Insect monsters local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) @@ -14,8 +14,9 @@ function s.initial_effect(c) e1:SetTargetRange(1,0) e1:SetTarget(s.sumlimit) c:RegisterEffect(e1) - --normal summon + --Immediately after this effect resolves, Normal Summon 1 Insect monster local e2=Effect.CreateEffect(c) + e2:SetDescription(aux.Stringid(id,0)) e2:SetCategory(CATEGORY_SUMMON) e2:SetType(EFFECT_TYPE_IGNITION) e2:SetRange(LOCATION_MZONE) @@ -23,8 +24,9 @@ function s.initial_effect(c) e2:SetTarget(s.nstg) e2:SetOperation(s.nsop) c:RegisterEffect(e2) - --special summon + --Special Summon this card from the GY local e3=Effect.CreateEffect(c) + e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_SPECIAL_SUMMON) e3:SetType(EFFECT_TYPE_IGNITION) e3:SetRange(LOCATION_GRAVE) @@ -46,8 +48,7 @@ function s.nstg(e,tp,eg,ep,ev,re,r,rp,chk) end function s.nsop(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON) - local g=Duel.SelectMatchingCard(tp,s.nsfilter,tp,LOCATION_HAND|LOCATION_MZONE,0,1,1,nil) - local tc=g:GetFirst() + local tc=Duel.SelectMatchingCard(tp,s.nsfilter,tp,LOCATION_HAND|LOCATION_MZONE,0,1,1,nil):GetFirst() if tc then Duel.Summon(tp,tc,true,nil) end @@ -69,7 +70,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) end function s.spop(e,tp,eg,ep,ev,re,r,rp) 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 --Banish it when it leaves the field local e1=Effect.CreateEffect(c) e1:SetDescription(3300) diff --git a/official/c30163008.lua b/official/c30163008.lua index f2eeb59021..989150fa7d 100644 --- a/official/c30163008.lua +++ b/official/c30163008.lua @@ -1,11 +1,13 @@ ---Ra'ten, the Heavenly General +--羅天神将 --Ra'ten, the Heavenly General local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() + --Link Summon procedure: 2+ monsters with the same Type Link.AddProcedure(c,nil,2,99,s.lcheck) - --special Summon + --Special Summon 1 Level 4 or lower monster with the same Type as a targeted monster from your hand to your zone this card points to local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e1:SetProperty(EFFECT_FLAG_CARD_TARGET) @@ -15,8 +17,9 @@ function s.initial_effect(c) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - --destroy + --Destroy 1 card your opponent controls local e2=Effect.CreateEffect(c) + e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_DESTROY) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetProperty(EFFECT_FLAG_CARD_TARGET) @@ -54,8 +57,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) local zone=e:GetHandler():GetLinkedZone(tp) if Duel.GetLocationCount(tp,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,zone)<=0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local g=Duel.SelectMatchingCard(tp,s.spfilter2,tp,LOCATION_HAND,0,1,1,nil,e,tp,tg:GetRace(),zone) - local tc=g:GetFirst() + local tc=Duel.SelectMatchingCard(tp,s.spfilter2,tp,LOCATION_HAND,0,1,1,nil,e,tp,tg:GetRace(),zone):GetFirst() if tc then Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP,zone) end @@ -65,11 +67,11 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chk==0 then return Duel.IsExistingTarget(nil,tp,0,LOCATION_ONFIELD,1,nil) end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local g=Duel.SelectTarget(tp,nil,tp,0,LOCATION_ONFIELD,1,1,nil) - Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0) + Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,tp,0) end function s.desop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() - if tc and tc:IsRelateToEffect(e) then + if tc:IsRelateToEffect(e) then Duel.Destroy(tc,REASON_EFFECT) end end \ No newline at end of file diff --git a/official/c33971095.lua b/official/c33971095.lua index 91bee19f9a..dd34ce0e82 100644 --- a/official/c33971095.lua +++ b/official/c33971095.lua @@ -1,14 +1,15 @@ ---Vendread Nightmare +--ヴェンデット・ナイトメア --Vendread Nightmare local s,id=GetID() function s.initial_effect(c) - --activate + --Activate local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) c:RegisterEffect(e1) - --increase lv + --Increase the level of 1 face-up monster you control by the number of monsters Tributed local e2=Effect.CreateEffect(c) + e2:SetDescription(aux.Stringid(id,0)) e2:SetCategory(CATEGORY_LVCHANGE) e2:SetType(EFFECT_TYPE_IGNITION) e2:SetProperty(EFFECT_FLAG_CARD_TARGET) @@ -18,8 +19,9 @@ function s.initial_effect(c) e2:SetTarget(s.lvtg) e2:SetOperation(s.lvop) c:RegisterEffect(e2) - --increase atk + --You attacking "Vendread" Ritual Monster gains 1000 ATK local e3=Effect.CreateEffect(c) + e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_ATKCHANGE) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetCode(EVENT_BATTLE_DESTROYING) @@ -46,8 +48,9 @@ end function s.lvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and s.lvfilter(chkc) end if chk==0 then return true end - Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) - Duel.SelectTarget(tp,s.lvfilter,tp,LOCATION_MZONE,0,1,1,nil) + Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_APPLYTO) + local g=Duel.SelectTarget(tp,s.lvfilter,tp,LOCATION_MZONE,0,1,1,nil) + Duel.SetOperationInfo(0,CATEGORY_LVCHANGE,g,1,tp,e:GetLabel()) end function s.lvop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c34479658.lua b/official/c34479658.lua index 732f045793..7c8d41bdee 100644 --- a/official/c34479658.lua +++ b/official/c34479658.lua @@ -23,7 +23,6 @@ function s.initial_effect(c) e2:SetValue(s.valcheck) c:RegisterEffect(e2) e2:SetLabelObject(e1) - e2:SetLabelObject(e1) --Add to hand local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) @@ -36,7 +35,7 @@ function s.initial_effect(c) e3:SetOperation(s.thop) c:RegisterEffect(e3) end -s.listed_names={34479659} +s.listed_names={34479659} --"Alligator Token" function s.otfilter(c) return c:IsRace(RACE_REPTILE) end diff --git a/official/c34559295.lua b/official/c34559295.lua index b2764af314..f46f1adfc7 100644 --- a/official/c34559295.lua +++ b/official/c34559295.lua @@ -1,9 +1,10 @@ ---Iron Draw +--アイアンドロー --Iron Draw local s,id=GetID() function s.initial_effect(c) - --Activate + --Draw 2 cards local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DRAW) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) diff --git a/official/c3779493.lua b/official/c3779493.lua index c1ac601d60..559f9cd942 100644 --- a/official/c3779493.lua +++ b/official/c3779493.lua @@ -1,13 +1,13 @@ ---Night's End Administrator +--ナイトエンド・アドミニストレーター --Night's End Administrator local s,id=GetID() function s.initial_effect(c) - --synchro summon - Synchro.AddProcedure(c,aux.FilterSummonCode(36107810),1,1,Synchro.NonTuner(nil),1,99) c:EnableReviveLimit() - --Banish a card when another monster is summoned + --Synchro Summon procedure: "Night's End Sorcerer" + 1+ non-Tuner monsters + Synchro.AddProcedure(c,aux.FilterSummonCode(36107810),1,1,Synchro.NonTuner(nil),1,99) + --Banish 1 card in your opponent's GY local e1=Effect.CreateEffect(c) - e1:SetDescription(aux.Stringid(id,1)) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_REMOVE) e1:SetCode(EVENT_SPSUMMON_SUCCESS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) @@ -17,9 +17,9 @@ function s.initial_effect(c) e1:SetTarget(s.rmvtg) e1:SetOperation(s.rmvop) c:RegisterEffect(e1) - --special summon + --Special Summon 1 Level 4 or lower Spellcaster monster in your GY local e2=Effect.CreateEffect(c) - e2:SetDescription(aux.Stringid(id,3)) + e2:SetDescription(aux.Stringid(id,1)) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP) e2:SetCode(EVENT_DESTROYED) @@ -30,8 +30,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) end s.material={36107810} -s.listed_names={36107810} ---banish when itself or a spellcaster is summoned +s.listed_names={36107810} --"Night's End Sorcerer" function s.cfilter(c,tp) return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsControler(tp) end @@ -51,11 +50,10 @@ function s.rmvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) end function s.rmvop(e,tp,eg,ep,ev,re,r,rp,chk) local tc=Duel.GetFirstTarget() - if tc and tc:IsRelateToEffect(e) then + if tc:IsRelateToEffect(e) then Duel.Remove(tc,POS_FACEUP,REASON_EFFECT) end end ---summon a spellcaster from gy function s.spcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() return (rp==1-tp and c:IsReason(REASON_EFFECT) and c:IsPreviousControler(tp) @@ -70,7 +68,7 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) and Duel.IsExistingTarget(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectTarget(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0) + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,tp,0) end function s.spop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() diff --git a/official/c39581190.lua b/official/c39581190.lua index d4f424d5ea..c13af8c233 100644 --- a/official/c39581190.lua +++ b/official/c39581190.lua @@ -1,8 +1,8 @@ ---Subterror Nemesis Archer +--サブテラーの射手 --Subterror Nemesis Archer local s,id=GetID() function s.initial_effect(c) - --to deck + --Shuffle an opponent's face-down Defense Position monster into the Deck local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TODECK) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.tdtg) e1:SetOperation(s.tdop) c:RegisterEffect(e1) - --spsummon + --Special Summon 1 "Subterror" monster from your Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) diff --git a/official/c40240595.lua b/official/c40240595.lua index 72923eb6e3..f729df3219 100644 --- a/official/c40240595.lua +++ b/official/c40240595.lua @@ -1,9 +1,9 @@ ---Cocoon of Evolution +--進化の繭 --Cocoon of Evolution --fixed by Larry126 local s,id=GetID() function s.initial_effect(c) - --equip + --Equip this card to 1 "Petit Moth" you control local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_IGNITION) @@ -31,7 +31,7 @@ function s.initial_effect(c) e3:SetOperation(s.checkop2) c:RegisterEffect(e3) end -s.listed_names={58192742,id} +s.listed_names={58192742,id} --"Petit Moth" function s.checkcon(e,tp,eg,ep,ev,re,r,rp) local g=e:GetHandler():GetCardTarget() return Duel.IsTurnPlayer(tp) and g and g:IsExists(Card.IsCode,1,nil,58192742) diff --git a/official/c42713844.lua b/official/c42713844.lua index c5aa696059..925b49156e 100644 --- a/official/c42713844.lua +++ b/official/c42713844.lua @@ -1,8 +1,8 @@ ---Subterror Behemoth Umastryx +--サブテラーマリス・リグリアード --Subterror Behemoth Umastryx local s,id=GetID() function s.initial_effect(c) - --flip + --Banish 1 monster your opponent controls local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_REMOVE) @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetTarget(s.rmtg) e1:SetOperation(s.rmop) c:RegisterEffect(e1) - --special summon + --Special Summon this card from your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) c:RegisterEffect(e2) - --turn set + --Change this card to face-down Defense Position local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) e3:SetCategory(CATEGORY_POSITION) @@ -67,7 +67,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c42925441.lua b/official/c42925441.lua index c6a4d5a0f3..17c5e163bc 100644 --- a/official/c42925441.lua +++ b/official/c42925441.lua @@ -97,7 +97,6 @@ function s.efftg(e,tp,eg,ep,ev,re,r,rp,chk) {b2,aux.Stringid(id,3)}, {b3,aux.Stringid(id,4)}) e:SetLabel(op) - e:SetLabel(op) if op==1 then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local g=Duel.SelectMatchingCard(tp,s.costfilter1,tp,LOCATION_MZONE,0,1,1,nil,e,tp) diff --git a/official/c44221928.lua b/official/c44221928.lua index 1c5258a52e..d9a700b877 100644 --- a/official/c44221928.lua +++ b/official/c44221928.lua @@ -1,4 +1,4 @@ ---Breath of Acclamation +--褒誉の息吹 --Breath of Acclamation local s,id=GetID() function s.initial_effect(c) diff --git a/official/c44373896.lua b/official/c44373896.lua index 2d7592df40..68a91a2e3b 100644 --- a/official/c44373896.lua +++ b/official/c44373896.lua @@ -1,4 +1,4 @@ ---Destruction Dragon +--デストロイ・ドラゴン --Destruction Dragon local s,id=GetID() function s.initial_effect(c) @@ -9,19 +9,20 @@ function s.initial_effect(c) e1:SetCode(EFFECT_SPSUMMON_CONDITION) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) c:RegisterEffect(e1) - --destroy & damage + --Destroy 1 card your opponent controls then, if it was a Monster Card, inflict damage to your opponent equal to its original ATK local e2=Effect.CreateEffect(c) - e2:SetCategory(CATEGORY_DESTROY+CATEGORY_DAMAGE) e2:SetDescription(aux.Stringid(id,0)) + e2:SetCategory(CATEGORY_DESTROY+CATEGORY_DAMAGE) e2:SetType(EFFECT_TYPE_IGNITION) e2:SetProperty(EFFECT_FLAG_CARD_TARGET) - e2:SetCountLimit(1) e2:SetRange(LOCATION_MZONE) + e2:SetCountLimit(1) e2:SetTarget(s.target) e2:SetOperation(s.operation) c:RegisterEffect(e2) end s.material_trap=83555666 +s.listed_names={11082056} --"The Fang of Critias", "Ring of Destruction" function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsControler(1-tp) and chkc:IsOnField() end if chk==0 then return Duel.IsExistingTarget(aux.TRUE,tp,0,LOCATION_ONFIELD,1,nil) end diff --git a/official/c46660187.lua b/official/c46660187.lua index 4597823b50..645b158f91 100644 --- a/official/c46660187.lua +++ b/official/c46660187.lua @@ -1,9 +1,10 @@ ---War Rock Big Blow +--ウォークライ・ビッグブロウ --War Rock Big Blow local s,id=GetID() function s.initial_effect(c) - --Activate + --Destroy up to 2 cards your opponent controls local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DESTROY) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_LEAVE_FIELD) diff --git a/official/c47556396.lua b/official/c47556396.lua index c6bf212898..47232b74e7 100644 --- a/official/c47556396.lua +++ b/official/c47556396.lua @@ -1,8 +1,8 @@ ---Subterror Behemoth Speleogeist +--サブテラーマリス・エルガウスト --Subterror Behemoth Speleogeist local s,id=GetID() function s.initial_effect(c) - --flip + --Change 1 face-up monster on the field to face-up Attack Position if it is in Defense Position, also change its ATK to 0. local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_POSITION+CATEGORY_ATKCHANGE) @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) c:RegisterEffect(e1) - --special summon + --Special Summon this card from your hand in Defense Position local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) c:RegisterEffect(e2) - --turn set + --Change this card to face-down Defense Position local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) e3:SetCategory(CATEGORY_POSITION) diff --git a/official/c54734082.lua b/official/c54734082.lua index 967928e27f..61a6dc5870 100644 --- a/official/c54734082.lua +++ b/official/c54734082.lua @@ -1,9 +1,10 @@ ---Magnet Induction +--マグネット・インダクション --Magnet Induction local s,id=GetID() function s.initial_effect(c) - --Activate + --Special Summon 1 Level 4 or lower "Magnet Warrior" monster from your Deck with a different name than the cards you control local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) @@ -13,6 +14,7 @@ function s.initial_effect(c) e1:SetOperation(s.activate) c:RegisterEffect(e1) end +s.listed_series={SET_MAGNET_WARRIOR,SET_MAGNA_WARRIOR} function s.cfilter(c) return c:IsFaceup() and c:IsSetCard(SET_MAGNET_WARRIOR) and c:GetOriginalLevel()<=4 end @@ -29,14 +31,13 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK) end function s.activate(e,tp,eg,ep,ev,re,r,rp) - --Cannot be destroyed by battle or the opponent's card effects - local e1=Effect.CreateEffect(e:GetHandler()) + --"Magnet Warrior" and "Magna Warrior" monsters you control cannot be destroyed by battle or your opponent's card effects e1:SetType(EFFECT_TYPE_FIELD) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetReset(RESET_PHASE|PHASE_END) - e1:SetTarget(s.tg) + e1:SetTarget(function(e,c) return c:IsSetCard({SET_MAGNET_WARRIOR,SET_MAGNA_WARRIOR}) end) e1:SetValue(1) Duel.RegisterEffect(e1,tp) local e2=e1:Clone() @@ -49,7 +50,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if #g>0 then Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) end -end -function s.tg(e,c) - return c:IsFaceup() and (c:IsSetCard(SET_MAGNET_WARRIOR) or c:IsSetCard(SET_MAGNA_WARRIOR)) end \ No newline at end of file diff --git a/official/c5697558.lua b/official/c5697558.lua index 12e54acb6a..b4c8e53e64 100644 --- a/official/c5697558.lua +++ b/official/c5697558.lua @@ -1,16 +1,17 @@ ---The Hidden City +--地中界シャンバラ --The Hidden City local s,id=GetID() function s.initial_effect(c) --Activate local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,1)) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH) e1:SetOperation(s.activate) c:RegisterEffect(e1) - --change pos + --Change 1 face-down Defense Position "Subterror" monster you control to face-up Attack or Defense Position local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_POSITION) @@ -20,7 +21,7 @@ function s.initial_effect(c) e2:SetTarget(s.postg) e2:SetOperation(s.posop) c:RegisterEffect(e2) - --negate attack + --Change 1 face-down Defense Position "Subterror" monster you control to face-up Attack or Defense Position, then you can negate an opponent's monster's attack local e3=Effect.CreateEffect(c) e3:SetCategory(CATEGORY_POSITION) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) @@ -36,7 +37,6 @@ function s.thfilter(c) return c:IsMonster() and c:IsSetCard(SET_SUBTERROR) and c:IsAbleToHand() end function s.activate(e,tp,eg,ep,ev,re,r,rp) - if not e:GetHandler():IsRelateToEffect(e) then return end local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil) if #g>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) @@ -70,10 +70,8 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_POSITION,nil,1,0,0) end function s.operation(e,tp,eg,ep,ev,re,r,rp) - if not e:GetHandler():IsRelateToEffect(e) then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE) - local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_MZONE,0,1,1,nil) - local tc=g:GetFirst() + local tc=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_MZONE,0,1,1,nil):GetFirst() if tc then local pos=Duel.SelectPosition(tp,tc,POS_FACEUP_ATTACK+POS_FACEUP_DEFENSE) if Duel.ChangePosition(tc,pos)~=0 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then diff --git a/official/c5779502.lua b/official/c5779502.lua index 37d0618fc1..f70b15b20e 100644 --- a/official/c5779502.lua +++ b/official/c5779502.lua @@ -1,4 +1,4 @@ ---Underdog +--形勢反転 --Underdog local s,id=GetID() function s.initial_effect(c) From 5f970122c663ff42abe787a3b7cb47ff327decb7 Mon Sep 17 00:00:00 2001 From: Naim Date: Tue, 24 Jun 2025 08:31:21 -0300 Subject: [PATCH 2/4] japanese names --- official/c11677278.lua | 2 +- official/c13204145.lua | 2 +- official/c16955631.lua | 2 +- official/c19338434.lua | 2 +- official/c22916418.lua | 2 +- official/c23920796.lua | 2 +- official/c29265962.lua | 2 +- official/c42940335.lua | 2 +- official/c43066927.lua | 2 +- official/c50415441.lua | 2 +- official/c55537983.lua | 2 +- official/c55733143.lua | 2 +- official/c58258899.lua | 4 ++-- official/c58288565.lua | 2 +- official/c59293853.lua | 2 +- official/c60759087.lua | 8 ++++---- official/c64213017.lua | 2 +- official/c64753157.lua | 2 +- official/c65430555.lua | 2 +- official/c65976795.lua | 2 +- official/c66698383.lua | 4 ++-- official/c68001309.lua | 2 +- official/c68811206.lua | 2 +- official/c69757518.lua | 2 +- official/c6992184.lua | 2 +- official/c70491682.lua | 2 +- official/c71331215.lua | 2 +- official/c71921856.lua | 2 +- official/c72309040.lua | 2 +- official/c74414885.lua | 2 +- official/c74762582.lua | 2 +- official/c76552147.lua | 2 +- official/c76798740.lua | 2 +- official/c78202553.lua | 2 +- official/c79072916.lua | 2 +- official/c79324191.lua | 2 +- official/c79371897.lua | 2 +- official/c80040886.lua | 2 +- official/c80551022.lua | 2 +- official/c81522098.lua | 2 +- official/c82270047.lua | 2 +- official/c83880473.lua | 2 +- official/c84125619.lua | 2 +- official/c84462118.lua | 2 +- official/c84673574.lua | 2 +- official/c85847157.lua | 2 +- official/c8608979.lua | 2 +- official/c86809440.lua | 2 +- official/c87676171.lua | 2 +- official/c88106656.lua | 2 +- official/c92744676.lua | 2 +- official/c92970404.lua | 2 +- official/c93860227.lua | 2 +- official/c93880808.lua | 2 +- official/c9416697.lua | 2 +- official/c94568601.lua | 1 - official/c97637162.lua | 2 +- official/c97946536.lua | 2 +- 58 files changed, 62 insertions(+), 63 deletions(-) diff --git a/official/c11677278.lua b/official/c11677278.lua index 1b73137097..125f850e4e 100644 --- a/official/c11677278.lua +++ b/official/c11677278.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・アーマー --Mimighoul Armor --scripted by Hatter local s,id=GetID() diff --git a/official/c13204145.lua b/official/c13204145.lua index 28a94722b1..c8a8c77696 100644 --- a/official/c13204145.lua +++ b/official/c13204145.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・メーカー --Mimighoul Maker --Scripted by Hatter local s,id=GetID() diff --git a/official/c16955631.lua b/official/c16955631.lua index f604cc64c6..d0b312e92d 100644 --- a/official/c16955631.lua +++ b/official/c16955631.lua @@ -1,4 +1,4 @@ ---Japanese name +--ジャイアント・ミミグル --Giant Mimighoul --Scripted by the Razgriz local s,id=GetID() diff --git a/official/c19338434.lua b/official/c19338434.lua index ee4ac36ef9..acfa3b6aef 100644 --- a/official/c19338434.lua +++ b/official/c19338434.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・フォーク --Mimighoul Fork --scripted by Naim local s,id=GetID() diff --git a/official/c22916418.lua b/official/c22916418.lua index bcb15c4428..4c825827e3 100644 --- a/official/c22916418.lua +++ b/official/c22916418.lua @@ -1,4 +1,4 @@ ---Japanese name +--超人伝－マントマン --Mantman the Ultrahuman --scripted by pyrQ local s,id=GetID() diff --git a/official/c23920796.lua b/official/c23920796.lua index cb3f82e6dc..f43ceb9252 100644 --- a/official/c23920796.lua +++ b/official/c23920796.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・ケルベロス --Mimighoul Cerberus --Scripted by Hatter local s,id=GetID() diff --git a/official/c29265962.lua b/official/c29265962.lua index 4bb605b74b..ecb7ea7f63 100644 --- a/official/c29265962.lua +++ b/official/c29265962.lua @@ -1,4 +1,4 @@ ---Japanese name +--同姓同名同盟罷業 --The League of Uniform Nomenclature Strikes --scripted by Naim local s,id=GetID() diff --git a/official/c42940335.lua b/official/c42940335.lua index 1c14f754ce..c74a26382b 100644 --- a/official/c42940335.lua +++ b/official/c42940335.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・スローン --Mimighoul Throne --Scripted by the Razgriz local s,id=GetID() diff --git a/official/c43066927.lua b/official/c43066927.lua index 68469169d6..8fdb725d07 100644 --- a/official/c43066927.lua +++ b/official/c43066927.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・フェアリー --Mimighoul Fairy --scripted by Hatter local s,id=GetID() diff --git a/official/c50415441.lua b/official/c50415441.lua index 6b4281a4dd..bda46cefc1 100644 --- a/official/c50415441.lua +++ b/official/c50415441.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・デーモン --Mimighoul Archfiend --Scripted by Hatter local s,id=GetID() diff --git a/official/c55537983.lua b/official/c55537983.lua index 000831cef2..cd35a0bf2c 100644 --- a/official/c55537983.lua +++ b/official/c55537983.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・マスター --Mimighoul Master --Scripted by Hatter local s,id=GetID() diff --git a/official/c55733143.lua b/official/c55733143.lua index 20eafb0333..d445785893 100644 --- a/official/c55733143.lua +++ b/official/c55733143.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・チャーム --Mimighoul Charm --Scripted by Hatter local s,id=GetID() diff --git a/official/c58258899.lua b/official/c58258899.lua index 4a9cf7b9a4..df184e746c 100644 --- a/official/c58258899.lua +++ b/official/c58258899.lua @@ -1,4 +1,4 @@ ---TGX300 +--ＴＧＸ３００ --TGX300 local s,id=GetID() function s.initial_effect(c) @@ -7,7 +7,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) c:RegisterEffect(e1) - --atk up + --Face-up monsters you control gain 300 ATK for each "T.G." monster you control local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) e2:SetCode(EFFECT_UPDATE_ATTACK) diff --git a/official/c58288565.lua b/official/c58288565.lua index 896788f474..94f74d6ffe 100644 --- a/official/c58288565.lua +++ b/official/c58288565.lua @@ -1,4 +1,4 @@ ---Japanese name +--バタフライ・フィッシュ --Butterfly Fish --scripted by pyrQ local s,id=GetID() diff --git a/official/c59293853.lua b/official/c59293853.lua index 58879fc8d4..94ffc4cd7c 100644 --- a/official/c59293853.lua +++ b/official/c59293853.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・ルーム --Mimighoul Room --Scripted by Hatter local s,id=GetID() diff --git a/official/c60759087.lua b/official/c60759087.lua index eabd17146a..9371b401a3 100644 --- a/official/c60759087.lua +++ b/official/c60759087.lua @@ -1,9 +1,9 @@ ---Evil★Twin Present +--Ｅｖｉｌ★Ｔｗｉｎ プレゼント --Evil★Twin Present --Scripted by Naim local s,id=GetID() function s.initial_effect(c) - --Switch control + --Switch control of 1 "Ki-sikil" monster or 1 "Lil-la" monster you control and 1 face-up monster your opponent controls local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_CONTROL) @@ -16,7 +16,7 @@ function s.initial_effect(c) e1:SetTarget(s.conttg) e1:SetOperation(s.contop) c:RegisterEffect(e1) - --Shuffle a set Spell/Trap into the Deck + --Shuffle 1 Set Spell/Trap into the Deck local e2=e1:Clone() e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_TODECK) @@ -69,7 +69,7 @@ function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) end function s.tdop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() - if tc and tc:IsRelateToEffect(e) then + if tc:IsRelateToEffect(e) then Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) end end \ No newline at end of file diff --git a/official/c64213017.lua b/official/c64213017.lua index 7078bac8ec..d2757af46c 100644 --- a/official/c64213017.lua +++ b/official/c64213017.lua @@ -1,4 +1,4 @@ ---Beetrooper Formation +--騎甲虫隊戦術機動 --Beetrooper Formation local s,id=GetID() function s.initial_effect(c) diff --git a/official/c64753157.lua b/official/c64753157.lua index ef38f7ca58..b01575600d 100644 --- a/official/c64753157.lua +++ b/official/c64753157.lua @@ -1,4 +1,4 @@ ---Charming Resort Staff +--ＲＥＳＯＲＴ」 ＳＴＡＦＦ－チャーミング --Charming Resort Staff local s,id=GetID() function s.initial_effect(c) diff --git a/official/c65430555.lua b/official/c65430555.lua index 7cef0f7899..17783eb6c8 100644 --- a/official/c65430555.lua +++ b/official/c65430555.lua @@ -1,4 +1,4 @@ ---Beetrooper Sting Lancer +--騎甲虫スティンギー・ランス --Beetrooper Sting Lancer local s,id=GetID() function s.initial_effect(c) diff --git a/official/c65976795.lua b/official/c65976795.lua index 61151bf168..3324bcafce 100644 --- a/official/c65976795.lua +++ b/official/c65976795.lua @@ -1,4 +1,4 @@ ---Subterror Behemoth Stygokraken +--サブテラーマリス・アクエドリア --Subterror Behemoth Stygokraken local s,id=GetID() function s.initial_effect(c) diff --git a/official/c66698383.lua b/official/c66698383.lua index 97c742f246..39bfa4cbbf 100644 --- a/official/c66698383.lua +++ b/official/c66698383.lua @@ -1,8 +1,8 @@ ---Vermillion Dragon Mech +--灼銀の機竜 --Vermillion Dragon Mech local s,id=GetID() function s.initial_effect(c) - --synchro summon + --synchro summon : 1 Tuner + 1+ non-Tuner monsters c:EnableReviveLimit() Synchro.AddProcedure(c,nil,1,1,Synchro.NonTuner(nil),1,99) --destroy diff --git a/official/c68001309.lua b/official/c68001309.lua index fb797c532d..1e633b6ae1 100644 --- a/official/c68001309.lua +++ b/official/c68001309.lua @@ -1,4 +1,4 @@ ---Subterror Cave Clash +--サブテラーの激闘 --Subterror Cave Clash local s,id=GetID() function s.initial_effect(c) diff --git a/official/c68811206.lua b/official/c68811206.lua index 518a11901a..afe169cbad 100644 --- a/official/c68811206.lua +++ b/official/c68811206.lua @@ -1,4 +1,4 @@ ---Tyler the Great Warrior +--偉大なる戦士タイラー --Tyler the Great Warrior local s,id=GetID() function s.initial_effect(c) diff --git a/official/c69757518.lua b/official/c69757518.lua index b324fab321..a0e8334d99 100644 --- a/official/c69757518.lua +++ b/official/c69757518.lua @@ -1,4 +1,4 @@ ---Number C5: Chaos Chimera Dragon +--ＣＮｏ．５ 亡朧龍 カオス・キマイラ・ドラゴン --Number C5: Chaos Chimera Dragon local s,id=GetID() function s.initial_effect(c) diff --git a/official/c6992184.lua b/official/c6992184.lua index 2966e5f3cf..4af680f4d6 100644 --- a/official/c6992184.lua +++ b/official/c6992184.lua @@ -1,4 +1,4 @@ ---Pendulum Encore +--ペンデュラム・アンコール --Pendulum Encore local s,id=GetID() function s.initial_effect(c) diff --git a/official/c70491682.lua b/official/c70491682.lua index 8307463795..c256f7feb3 100644 --- a/official/c70491682.lua +++ b/official/c70491682.lua @@ -1,4 +1,4 @@ ---Vendread Anima +--ヴェンデット・アニマ --Vendread Anima local s,id=GetID() function s.initial_effect(c) diff --git a/official/c71331215.lua b/official/c71331215.lua index b3d651db81..5f8b8be859 100644 --- a/official/c71331215.lua +++ b/official/c71331215.lua @@ -1,4 +1,4 @@ ---War Rock Ordeal +--ウォークライ・オーディール --War Rock Ordeal local s,id=GetID() function s.initial_effect(c) diff --git a/official/c71921856.lua b/official/c71921856.lua index 450f4fb4e6..f674bbe3d1 100644 --- a/official/c71921856.lua +++ b/official/c71921856.lua @@ -1,4 +1,4 @@ ---Number 79: Battlin' Boxer Nova Kaiser +--Ｎｏ．７９ ＢＫ 新星のカイザー --Number 79: Battlin' Boxer Nova Kaiser local s,id=GetID() function s.initial_effect(c) diff --git a/official/c72309040.lua b/official/c72309040.lua index feb7ade480..1fa5c93eb7 100644 --- a/official/c72309040.lua +++ b/official/c72309040.lua @@ -1,4 +1,4 @@ --- +--最果てのゴーティス --Ghoti of the Deep Beyond --scripted by Naim local s,id=GetID() diff --git a/official/c74414885.lua b/official/c74414885.lua index 274559a8f7..a2198ef08f 100644 --- a/official/c74414885.lua +++ b/official/c74414885.lua @@ -1,4 +1,4 @@ ---NEXT +--ＮＥＸＴ --NEXT --Scripted by AlphaKretin local s,id=GetID() diff --git a/official/c74762582.lua b/official/c74762582.lua index fe66ce192b..91dbe73f4e 100644 --- a/official/c74762582.lua +++ b/official/c74762582.lua @@ -1,4 +1,4 @@ ---Subterror Fiendess +--サブテラーの妖魔 --Subterror Fiendess local s,id=GetID() function s.initial_effect(c) diff --git a/official/c76552147.lua b/official/c76552147.lua index 6187864763..f461eae1dc 100644 --- a/official/c76552147.lua +++ b/official/c76552147.lua @@ -1,4 +1,4 @@ ---D.D.D. - Different Dimension Derby +--Ｄ・Ｄ・Ｄ --D.D.D. - Different Dimension Derby local s,id=GetID() function s.initial_effect(c) diff --git a/official/c76798740.lua b/official/c76798740.lua index 0d6af6478b..2bc2379ae8 100644 --- a/official/c76798740.lua +++ b/official/c76798740.lua @@ -1,4 +1,4 @@ ---Vendread Charge +--ヴェンデット・チャージ --Vendread Charge local s,id=GetID() function s.initial_effect(c) diff --git a/official/c78202553.lua b/official/c78202553.lua index bb2536d3b9..67149d3627 100644 --- a/official/c78202553.lua +++ b/official/c78202553.lua @@ -1,4 +1,4 @@ ---Subterror Behemoth Stalagmo +--サブテラーマリス・ジブラタール --Subterror Behemoth Stalagmo local s,id=GetID() function s.initial_effect(c) diff --git a/official/c79072916.lua b/official/c79072916.lua index 4167a08fbd..872e76899b 100644 --- a/official/c79072916.lua +++ b/official/c79072916.lua @@ -1,4 +1,4 @@ --- +--ミュートリア反射作用 --Myutant Blast --Scripted by senpaizuri local s,id=GetID() diff --git a/official/c79324191.lua b/official/c79324191.lua index 94b852db5e..20ac1a9c1b 100644 --- a/official/c79324191.lua +++ b/official/c79324191.lua @@ -1,4 +1,4 @@ ---Ninjitsu Art Notebook +--隠密忍法帖 --Ninjitsu Art Notebook local s,id=GetID() function s.initial_effect(c) diff --git a/official/c79371897.lua b/official/c79371897.lua index 7c927dc321..1acd5323bd 100644 --- a/official/c79371897.lua +++ b/official/c79371897.lua @@ -1,4 +1,4 @@ ---Reinforcement of the Army's Troops +--増援部隊 --Reinforcement of the Army's Troops local s,id=GetID() function s.initial_effect(c) diff --git a/official/c80040886.lua b/official/c80040886.lua index 58f1ec9bce..e318e03ed3 100644 --- a/official/c80040886.lua +++ b/official/c80040886.lua @@ -1,4 +1,4 @@ --- +--碧鋼の機竜 --Navy Dragon Mech --scripted by Naim local s,id=GetID() diff --git a/official/c80551022.lua b/official/c80551022.lua index d3ebb9a8b2..f368cc7f95 100644 --- a/official/c80551022.lua +++ b/official/c80551022.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・ルーム --Mimighoul Slime --scripted by Hatter local s,id=GetID() diff --git a/official/c81522098.lua b/official/c81522098.lua index 81ed8c728c..23731cbe56 100644 --- a/official/c81522098.lua +++ b/official/c81522098.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・ドラゴン --Mimighoul Dragon --Scripted by Hatter local s,id=GetID() diff --git a/official/c82270047.lua b/official/c82270047.lua index 73f8e99003..be92359b22 100644 --- a/official/c82270047.lua +++ b/official/c82270047.lua @@ -1,4 +1,4 @@ ---Kozmo Lightsword +--Ｋｏｚｍｏ－レイブレード --Kozmo Lightsword local s,id=GetID() function s.initial_effect(c) diff --git a/official/c83880473.lua b/official/c83880473.lua index d041873a4f..951784f3f2 100644 --- a/official/c83880473.lua +++ b/official/c83880473.lua @@ -1,4 +1,4 @@ ---War Rock Spirit +--ウォークライ・スピリッツ --War Rock Spirit local s,id=GetID() function s.initial_effect(c) diff --git a/official/c84125619.lua b/official/c84125619.lua index 80e08557ac..1bd472eac3 100644 --- a/official/c84125619.lua +++ b/official/c84125619.lua @@ -1,4 +1,4 @@ ---Expendable Dai +--刺し違ＧＵＹ --Expendable Dai local s,id=GetID() function s.initial_effect(c) diff --git a/official/c84462118.lua b/official/c84462118.lua index 5d8f098740..bcbe5243dd 100644 --- a/official/c84462118.lua +++ b/official/c84462118.lua @@ -1,4 +1,4 @@ --- +--竜咬蟲 --Dragonbite --Scripted by Zefile local s,id=GetID() diff --git a/official/c84673574.lua b/official/c84673574.lua index e64facb55e..22341411d2 100644 --- a/official/c84673574.lua +++ b/official/c84673574.lua @@ -1,4 +1,4 @@ ---Japanese name +--ＱＱエニアゴン --QQ Enneagon --Scripted by The Razgriz local s,id=GetID() diff --git a/official/c85847157.lua b/official/c85847157.lua index 8a5e004a3f..eae2571042 100644 --- a/official/c85847157.lua +++ b/official/c85847157.lua @@ -1,4 +1,4 @@ ---Proof of Pruflas +--プルーフ・プルフラス --Proof of Pruflas local s,id=GetID() function s.initial_effect(c) diff --git a/official/c8608979.lua b/official/c8608979.lua index a2b889139c..7baf6d2f56 100644 --- a/official/c8608979.lua +++ b/official/c8608979.lua @@ -1,4 +1,4 @@ ---Super Team Buddy Force Unite! +--一族の結集 --Super Team Buddy Force Unite! local s,id=GetID() function s.initial_effect(c) diff --git a/official/c86809440.lua b/official/c86809440.lua index 77ad073133..484b1345a4 100644 --- a/official/c86809440.lua +++ b/official/c86809440.lua @@ -1,4 +1,4 @@ ---Japanese name +--ミミグル・ダンジョン --Mimighoul Dungeon --Scripted by Hatter local s,id=GetID() diff --git a/official/c87676171.lua b/official/c87676171.lua index 1a65fd39fb..1188bcf896 100644 --- a/official/c87676171.lua +++ b/official/c87676171.lua @@ -1,4 +1,4 @@ --- +--神蝕む光 ティスティナ --Tistina, the Divinity that Defies Darkness --Scripted by Hatter local s,id=GetID() diff --git a/official/c88106656.lua b/official/c88106656.lua index 1141a93e7e..65e1fc587b 100644 --- a/official/c88106656.lua +++ b/official/c88106656.lua @@ -1,4 +1,4 @@ --- +--リブロマンサー・ファイアバースト --Libromancer Fireburst --scripted by Naim local s,id=GetID() diff --git a/official/c92744676.lua b/official/c92744676.lua index 3a192d3f9d..b3a8a45bf7 100644 --- a/official/c92744676.lua +++ b/official/c92744676.lua @@ -1,4 +1,4 @@ ---Japanese name +--デンジエビ --Zapper Shrimp --scripted by Naim local s,id=GetID() diff --git a/official/c92970404.lua b/official/c92970404.lua index 89579104b8..0727b61dde 100644 --- a/official/c92970404.lua +++ b/official/c92970404.lua @@ -1,4 +1,4 @@ ---Subterror Behemoth Ultramafus +--サブテラーマリス・バレスアッシュ --Subterror Behemoth Ultramafus local s,id=GetID() function s.initial_effect(c) diff --git a/official/c93860227.lua b/official/c93860227.lua index 46bae7132a..7127d1d0cc 100644 --- a/official/c93860227.lua +++ b/official/c93860227.lua @@ -1,4 +1,4 @@ ---Japanese name +--優麗なる霊鏡姫 --Necroquip Princess --Scripted by Hatter local s,id=GetID() diff --git a/official/c93880808.lua b/official/c93880808.lua index 6e09d99cc4..039a32b37d 100644 --- a/official/c93880808.lua +++ b/official/c93880808.lua @@ -1,4 +1,4 @@ ---Arcana Triumph Joker +--アルカナ トライアンフジョーカー --Arcana Triumph Joker local s,id=GetID() function s.initial_effect(c) diff --git a/official/c9416697.lua b/official/c9416697.lua index 5936d774bc..ed3472cdfe 100644 --- a/official/c9416697.lua +++ b/official/c9416697.lua @@ -1,4 +1,4 @@ --- +--ゴーティスの守人イーノック --Eanoc, Sentry of the Ghoti --scripted by Naim local s,id=GetID() diff --git a/official/c94568601.lua b/official/c94568601.lua index 9c539954d3..af9431d6a5 100644 --- a/official/c94568601.lua +++ b/official/c94568601.lua @@ -1,6 +1,5 @@ --タイラント・ドラゴン --Tyrant Dragon ---Tyrant Dragon local s,id=GetID() function s.initial_effect(c) --disable diff --git a/official/c97637162.lua b/official/c97637162.lua index d5fe68eedb..56120b365c 100644 --- a/official/c97637162.lua +++ b/official/c97637162.lua @@ -1,4 +1,4 @@ ---Handigallop +--ハンディ・ギャロップ --Handigallop local s,id=GetID() function s.initial_effect(c) diff --git a/official/c97946536.lua b/official/c97946536.lua index b6f8eebc5e..3484bbedf5 100644 --- a/official/c97946536.lua +++ b/official/c97946536.lua @@ -1,4 +1,4 @@ --- +--ゼクトライク－紅黄 --Zektrike Kou-ou --scripted by pyrQ local s,id=GetID() From 157a26cc3b6f0a1dc66eed2bff8add8b7279d126 Mon Sep 17 00:00:00 2001 From: Naim Date: Tue, 24 Jun 2025 17:32:18 -0300 Subject: [PATCH 3/4] some updates --- official/c64213017.lua | 39 ++++++++++++++++++--------------------- official/c64753157.lua | 10 +++++----- official/c65430555.lua | 31 +++++++++++++++---------------- official/c65976795.lua | 8 ++++---- official/c66698383.lua | 12 ++++++------ official/c68001309.lua | 11 +++++------ 6 files changed, 53 insertions(+), 58 deletions(-) diff --git a/official/c64213017.lua b/official/c64213017.lua index d2757af46c..9345aeef90 100644 --- a/official/c64213017.lua +++ b/official/c64213017.lua @@ -7,8 +7,9 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) c:RegisterEffect(e1) - --Special summon + --Special Summon 1 "Beetrooper" monster in your GY local e2=Effect.CreateEffect(c) + e2:SetDescription(aux.Stringid(id,0)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetProperty(EFFECT_FLAG_CARD_TARGET) e2:SetType(EFFECT_TYPE_IGNITION) @@ -17,8 +18,9 @@ function s.initial_effect(c) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) c:RegisterEffect(e2) - --token + --Special Summon 1 "Beetrooper Token" local e3=Effect.CreateEffect(c) + e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY) @@ -30,7 +32,7 @@ function s.initial_effect(c) e3:SetOperation(s.tkop) c:RegisterEffect(e3) end -s.listed_names={64213018} +s.listed_names={64213018} --"Beetrooper Token" s.listed_series={SET_BEETROOPER} function s.spfilter(c,e,tp) return c:IsSetCard(SET_BEETROOPER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) @@ -44,24 +46,20 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,tp,LOCATION_GRAVE) end function s.spop(e,tp,eg,ep,ev,re,r,rp) - local c=e:GetHandler() - if not c:IsRelateToEffect(e) then return end local tc=Duel.GetFirstTarget() - if tc and tc:IsRelateToEffect(e) then - if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 then - --Cannot attack this turn - local e1=Effect.CreateEffect(c) - e1:SetDescription(3206) - e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) - e1:SetType(EFFECT_TYPE_SINGLE) - e1:SetCode(EFFECT_CANNOT_ATTACK) - e1:SetReset(RESETS_STANDARD_PHASE_END) - tc:RegisterEffect(e1) - end - local atk=tc:GetTextAttack() - if atk>0 then - Duel.SetLP(tp,Duel.GetLP(tp)-atk) - end + if tc:IsRelateToEffect(e) and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 then + --Cannot attack this turn + local e1=Effect.CreateEffect(e:GetHandler()) + e1:SetDescription(3206) + e1:SetProperty(EFFECT_FLAG_CLIENT_HINT) + e1:SetType(EFFECT_TYPE_SINGLE) + e1:SetCode(EFFECT_CANNOT_ATTACK) + e1:SetReset(RESETS_STANDARD_PHASE_END) + tc:RegisterEffect(e1) + end + local atk=tc:GetTextAttack() + if atk>0 then + Duel.SetLP(tp,Duel.GetLP(tp)-atk) end end function s.tkfilter(c,tp) @@ -78,7 +76,6 @@ function s.tktarget(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,0) end function s.tkop(e,tp,eg,ep,ev,re,r,rp) - if not e:GetHandler():IsRelateToEffect(e) then return end if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsPlayerCanSpecialSummonMonster(tp,id+1,SET_BEETROOPER,TYPES_TOKEN,1000,1000,3,RACE_INSECT,ATTRIBUTE_EARTH) then local token=Duel.CreateToken(tp,id+1) Duel.SpecialSummon(token,0,tp,tp,false,false,POS_FACEUP) diff --git a/official/c64753157.lua b/official/c64753157.lua index b01575600d..055d21abac 100644 --- a/official/c64753157.lua +++ b/official/c64753157.lua @@ -2,7 +2,7 @@ --Charming Resort Staff local s,id=GetID() function s.initial_effect(c) - --atkdown + --Can change the ATK of an opponent's monster to 0 local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_ATKCHANGE) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) c:RegisterEffect(e1) - --special summon + -- Special Summon 1 "SPYRAL Super Agent" from your Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -24,7 +24,7 @@ function s.initial_effect(c) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) c:RegisterEffect(e2) - --to hand + --Return 1 "SPYRAL Super Agent" from your Graveyard to your hand local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) e3:SetCategory(CATEGORY_TOHAND) @@ -41,7 +41,7 @@ function s.initial_effect(c) e4:SetCode(EVENT_TO_GRAVE) c:RegisterEffect(e4) end -s.listed_names={41091257} +s.listed_names={41091257} --"SPYRAL Super Agent" function s.atkcon(e,tp,eg,ep,ev,re,r,rp) local a=Duel.GetAttacker() local d=Duel.GetAttackTarget() @@ -68,7 +68,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) end end function s.spcon(e,tp,eg,ep,ev,re,r,rp) - return r&REASON_EFFECT+REASON_BATTLE~=0 + return r&(REASON_EFFECT|REASON_BATTLE)>0 end function s.spfilter(c,e,tp) return c:IsCode(41091257) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/official/c65430555.lua b/official/c65430555.lua index 17783eb6c8..cf009da758 100644 --- a/official/c65430555.lua +++ b/official/c65430555.lua @@ -12,11 +12,11 @@ function s.initial_effect(c) e1:SetRange(LOCATION_HAND) e1:SetHintTiming(0,TIMING_MAIN_END) e1:SetCountLimit(1,id) - e1:SetCondition(s.spcon) + e1:SetCondition(function() return Duel.IsMainPhase() end) e1:SetTarget(s.sptg) e1:SetOperation(s.spop) c:RegisterEffect(e1) - --Add 1 "Beetrooper" S/T from Deck + --Add 1 "Beetrooper" Spell/Trap from Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) @@ -32,28 +32,27 @@ function s.initial_effect(c) c:RegisterEffect(e3) end s.listed_series={SET_BEETROOPER} -function s.spcon(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsMainPhase() +function s.insectfilter(c,tp) + return c:IsRace(RACE_INSECT) and c:IsControler(tp) end -function s.insectfilter(c) - return c:IsMonster() and c:IsRace(RACE_INSECT) and c:IsAbleToDeck() +function s.tdfilter(c,e) + return c:IsMonster() and c:IsAbleToDeck() and c:IsCanBeEffectTarget(e) end -function s.tgfilter(c) - return c:IsMonster() and c:IsAbleToDeck() +function s.rescon(sg,e,tp,mg) + return sg:IsExists(s.insectfilter,1,nil,tp) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chkc then return false end + local g=Duel.GetMatchingGroup(s.tdfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false) - and Duel.IsExistingTarget(s.tgfilter,tp,0,LOCATION_GRAVE,1,nil) - and Duel.IsExistingTarget(s.insectfilter,tp,LOCATION_GRAVE,0,1,nil) end - Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) - local g1=Duel.SelectTarget(tp,s.insectfilter,tp,LOCATION_GRAVE,0,1,1,nil) - Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) - local g2=Duel.SelectTarget(tp,s.tgfilter,tp,0,LOCATION_GRAVE,1,1,nil) - Duel.SetOperationInfo(0,CATEGORY_TODECK,g1+g2,2,0,0) - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0) + and #g>=2 and g:IsExists(Card.IsControler,1,nil,1-tp) + and g:IsExists(s.insectfilter,1,nil,tp) end + local sg=aux.SelectUnselectGroup(g,e,tp,2,2,s.rescon,1,HINTMSG_TODECK) + Duel.SetTargetCard(sg) + Duel.SetOperationInfo(0,CATEGORY_TODECK,sg,#sg,PLAYER_ALL,0) + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,tp,0) end function s.spop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c65976795.lua b/official/c65976795.lua index 3324bcafce..ff0c71f6f4 100644 --- a/official/c65976795.lua +++ b/official/c65976795.lua @@ -2,7 +2,7 @@ --Subterror Behemoth Stygokraken local s,id=GetID() function s.initial_effect(c) - --flip + --Destroy set cards on the field equal to the number of "Subterror Behemoth" monsters you control local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DESTROY) @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) c:RegisterEffect(e1) - --special summon + -- Special Summon this card from your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) @@ -23,7 +23,7 @@ function s.initial_effect(c) e2:SetTarget(s.sptg) e2:SetOperation(s.spop) c:RegisterEffect(e2) - --turn set + --Change this card to face-down Defense Position local e3=Effect.CreateEffect(c) e3:SetDescription(aux.Stringid(id,2)) e3:SetCategory(CATEGORY_POSITION) @@ -72,7 +72,7 @@ end function s.postg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chk==0 then return c:IsCanTurnSet() and c:GetFlagEffect(id)==0 end - c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END,0,1) + c:RegisterFlagEffect(id,RESET_EVENT|(RESETS_STANDARD&~RESET_TURN_SET)|RESET_PHASE|PHASE_END,0,1) Duel.SetOperationInfo(0,CATEGORY_POSITION,c,1,0,0) end function s.posop(e,tp,eg,ep,ev,re,r,rp) diff --git a/official/c66698383.lua b/official/c66698383.lua index 39bfa4cbbf..9380ddebbf 100644 --- a/official/c66698383.lua +++ b/official/c66698383.lua @@ -2,10 +2,10 @@ --Vermillion Dragon Mech local s,id=GetID() function s.initial_effect(c) - --synchro summon : 1 Tuner + 1+ non-Tuner monsters c:EnableReviveLimit() + --Synchro Summon procedure: 1 Tuner + 1+ non-Tuner monsters Synchro.AddProcedure(c,nil,1,1,Synchro.NonTuner(nil),1,99) - --destroy + --Destroy 1 card on the field local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DESTROY) @@ -17,7 +17,7 @@ function s.initial_effect(c) e1:SetTarget(s.destg) e1:SetOperation(s.desop) c:RegisterEffect(e1) - --search + --Add 1 of your banished Tuners to your hand local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_TOHAND) @@ -32,8 +32,8 @@ end function s.cfilter(c,tp) return (c:IsLocation(LOCATION_HAND|LOCATION_GRAVE) or c:IsFaceup()) and c:IsType(TYPE_TUNER) and c:IsAbleToRemoveAsCost() - and Duel.IsExistingTarget(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) and (c:IsLocation(LOCATION_HAND) or aux.SpElimFilter(c,true,true)) + and Duel.IsExistingTarget(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,Group.FromCards(c,c:GetEquipGroup())) end function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_HAND|LOCATION_ONFIELD|LOCATION_GRAVE,0,1,nil,tp) end @@ -50,7 +50,7 @@ function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) end function s.desop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() - if tc and tc:IsRelateToEffect(e) then + if tc:IsRelateToEffect(e) then Duel.Destroy(tc,REASON_EFFECT) end end @@ -71,7 +71,7 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) end function s.thop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetFirstTarget() - if tc and tc:IsRelateToEffect(e) then + if tc:IsRelateToEffect(e) then Duel.SendtoHand(tc,nil,REASON_EFFECT) end end \ No newline at end of file diff --git a/official/c68001309.lua b/official/c68001309.lua index 1e633b6ae1..76ff52fd37 100644 --- a/official/c68001309.lua +++ b/official/c68001309.lua @@ -7,7 +7,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) c:RegisterEffect(e1) - --atk up + --"Subterror" monsters you control gain 500 ATK and DEF for each Set monster on the field local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD) e2:SetCode(EFFECT_UPDATE_ATTACK) @@ -19,7 +19,7 @@ function s.initial_effect(c) local e3=e2:Clone() e3:SetCode(EFFECT_UPDATE_DEFENSE) c:RegisterEffect(e3) - --to hand + --Add 1 "Subterror" card in your Graveyard to your hand local e4=Effect.CreateEffect(c) e4:SetDescription(aux.Stringid(id,0)) e4:SetCategory(CATEGORY_TOHAND) @@ -40,7 +40,7 @@ function s.atkval(e,c) end function s.thcon(e,tp,eg,ep,ev,re,r,rp) local rc=eg:GetFirst() - return ep~=tp and rc:IsControler(tp) and rc:IsSetCard(SET_SUBTERROR) + return ep==1-tp and rc:IsControler(tp) and rc:IsSetCard(SET_SUBTERROR) end function s.thfilter(c) return c:IsSetCard(SET_SUBTERROR) and not c:IsCode(id) and c:IsAbleToHand() @@ -49,11 +49,10 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and s.thfilter(chkc) end if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) - local sg=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) - Duel.SetOperationInfo(0,CATEGORY_TOHAND,sg,1,0,0) + local g=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) + Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,tp,0) end function s.thop(e,tp,eg,ep,ev,re,r,rp) - if not e:GetHandler():IsRelateToEffect(e) then return end local tc=Duel.GetFirstTarget() if tc:IsRelateToEffect(e) then Duel.SendtoHand(tc,nil,REASON_EFFECT) From 37f0add1824139e74547971ab44ae1c607b25ce1 Mon Sep 17 00:00:00 2001 From: Naim Date: Tue, 24 Jun 2025 18:21:46 -0300 Subject: [PATCH 4/4] fix --- official/c64753157.lua | 4 ++-- official/c65430555.lua | 2 +- official/c68811206.lua | 25 ++++++++++--------------- official/c69757518.lua | 10 ++++++---- 4 files changed, 19 insertions(+), 22 deletions(-) diff --git a/official/c64753157.lua b/official/c64753157.lua index 055d21abac..8c65e69544 100644 --- a/official/c64753157.lua +++ b/official/c64753157.lua @@ -2,7 +2,7 @@ --Charming Resort Staff local s,id=GetID() function s.initial_effect(c) - --Can change the ATK of an opponent's monster to 0 + --Change the ATK of an opponent's monster to 0 local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_ATKCHANGE) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.atktg) e1:SetOperation(s.atkop) c:RegisterEffect(e1) - -- Special Summon 1 "SPYRAL Super Agent" from your Deck + --Special Summon 1 "SPYRAL Super Agent" from your Deck local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,1)) e2:SetCategory(CATEGORY_SPECIAL_SUMMON) diff --git a/official/c65430555.lua b/official/c65430555.lua index cf009da758..c4043d0ffe 100644 --- a/official/c65430555.lua +++ b/official/c65430555.lua @@ -44,7 +44,7 @@ end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() if chkc then return false end - local g=Duel.GetMatchingGroup(s.tdfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil) + local g=Duel.GetMatchingGroup(s.tdfilter,tp,LOCATION_GRAVE,LOCATION_GRAVE,nil,e) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and #g>=2 and g:IsExists(Card.IsControler,1,nil,1-tp) diff --git a/official/c68811206.lua b/official/c68811206.lua index afe169cbad..835439158b 100644 --- a/official/c68811206.lua +++ b/official/c68811206.lua @@ -2,23 +2,18 @@ --Tyler the Great Warrior local s,id=GetID() function s.initial_effect(c) - --spsummon condition + c:AddCannotBeSpecialSummoned() + --Inflict damage to your opponent's Life Points equal to the ATK of the destroyed monster local e1=Effect.CreateEffect(c) - e1:SetType(EFFECT_TYPE_SINGLE) - e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) - e1:SetCode(EFFECT_SPSUMMON_CONDITION) + e1:SetDescription(aux.Stringid(id,0)) + e1:SetCategory(CATEGORY_DAMAGE) + e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) + e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) + e1:SetCode(EVENT_BATTLE_DESTROYING) + e1:SetCondition(s.damcon) + e1:SetTarget(s.damtg) + e1:SetOperation(s.damop) c:RegisterEffect(e1) - --damage - local e2=Effect.CreateEffect(c) - e2:SetDescription(aux.Stringid(id,0)) - e2:SetCategory(CATEGORY_DAMAGE) - e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F) - e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET) - e2:SetCode(EVENT_BATTLE_DESTROYING) - e2:SetCondition(s.damcon) - e2:SetTarget(s.damtg) - e2:SetOperation(s.damop) - c:RegisterEffect(e2) end function s.damcon(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() diff --git a/official/c69757518.lua b/official/c69757518.lua index a0e8334d99..e35ef53b06 100644 --- a/official/c69757518.lua +++ b/official/c69757518.lua @@ -2,10 +2,10 @@ --Number C5: Chaos Chimera Dragon local s,id=GetID() function s.initial_effect(c) - --xyz summon - Xyz.AddProcedure(c,nil,6,3,nil,nil,Xyz.InfiniteMats) c:EnableReviveLimit() - --atk + --Xyz Summon procedure: 3+ Level 6 monsters + Xyz.AddProcedure(c,nil,6,3,nil,nil,Xyz.InfiniteMats) + --Gains 1000 ATK for each material attached to it local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetRange(LOCATION_MZONE) e1:SetValue(s.atkval) c:RegisterEffect(e1) - --chain attack + --This card can attack an opponent's monster again in a row local e2=Effect.CreateEffect(c) e2:SetDescription(aux.Stringid(id,0)) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) @@ -22,7 +22,9 @@ function s.initial_effect(c) e2:SetCost(Cost.Detach(1)) e2:SetOperation(s.atop) c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT) + --Place 1 card from the GY on the top of the Deck, and if you do, attach another to this card as material local e3=Effect.CreateEffect(c) + e3:SetDescription(aux.Stringid(id,1)) e3:SetCategory(CATEGORY_TODECK) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetProperty(EFFECT_FLAG_CARD_TARGET)