fix

671bd2b5 · Huangnan · b58c6090 · 671bd2b5 · 671bd2b5 · 671bd2b5
Commit 671bd2b5 authored Feb 19, 2025 by Huangnan
4 changed files
--- a/expansions/FiNALE.cdb
+++ b/expansions/FiNALE.cdb
--- a/expansions/script/c1007002.lua
+++ b/expansions/script/c1007002.lua
@@ -18,12 +18,12 @@ function c1007002.initial_effect(c)
 	e1:SetTarget(c1007002.addct)
 	e1:SetOperation(c1007002.addc)
 	c:RegisterEffect(e1)
-	--netgplayer
+	--在initial_effect中添加
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_CHAIN_SOLVING)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CAN_FORBIDDEN)
 	e2:SetOperation(c1007002.disop)
 	c:RegisterEffect(e2)
 	--indes
@@ -79,8 +79,18 @@ function c1007002.initial_effect(c)
 	c:RegisterEffect(e6)
 end
 function c1007002.disop(e,tp,eg,ep,ev,re,r,rp)
-	 if (re:IsHasProperty(EFFECT_FLAG_PLAYER_TARGET) or re:IsHasProperty(EFFECT_FLAG_CARD_TARGET)) then
-	 Duel.NegateEffect(ev)
+	if re:GetHandler()==e:GetHandler() then return end
+	if re:IsHasProperty(EFFECT_FLAG_PLAYER_TARGET) then
+		Duel.NegateEffect(ev)
+		return
+	end
+	if re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) then
+		Duel.NegateEffect(ev)
+		return
+	end
+	if not re:IsHasProperty(EFFECT_FLAG_CARD_TARGET) and re:IsHasType(EFFECT_TYPE_ACTIVATE) then
+		Duel.NegateEffect(ev)
+		return
 	end
 end
 function c1007002.mat_filter(c)

--- a/expansions/script/c1007010.lua
+++ b/expansions/script/c1007010.lua
 --童话的怪物·桥的巨人
-function c1007010.initial_effect(c)
-	c:SetUniqueOnField(1,0,1007010)
-	--Activate
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	c:RegisterEffect(e1)
-	--Activate
-	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetCountLimit(1,17010)
-	e2:SetCondition(c1007010.con)
-	e2:SetTarget(c1007010.target)
-	e2:SetOperation(c1007010.activate)
-	c:RegisterEffect(e2)
-	--selfdes
-	local e7=Effect.CreateEffect(c)
-	e7:SetType(EFFECT_TYPE_SINGLE)
-	e7:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e7:SetRange(LOCATION_MZONE)
-	e7:SetCode(EFFECT_SELF_DESTROY)
-	e7:SetCondition(c1007010.descon)
-	c:RegisterEffect(e7)
+local s,id,o=GetID()
+function s.initial_effect(c)
+    c:SetUniqueOnField(1,0,id)
+    --Activate
+    local e1=Effect.CreateEffect(c)
+    e1:SetType(EFFECT_TYPE_ACTIVATE)
+    e1:SetCode(EVENT_FREE_CHAIN)
+    c:RegisterEffect(e1)
+    --special summon
+    local e2=Effect.CreateEffect(c)
+    e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
+    e2:SetType(EFFECT_TYPE_IGNITION)
+    e2:SetRange(LOCATION_SZONE)
+    e2:SetCountLimit(1,id)
+    e2:SetTarget(s.sptg)
+    e2:SetOperation(s.spop)
+    c:RegisterEffect(e2)
+    --selfdes
+    local e3=Effect.CreateEffect(c)
+    e3:SetType(EFFECT_TYPE_SINGLE)
+    e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+    e3:SetRange(LOCATION_MZONE)
+    e3:SetCode(EFFECT_SELF_DESTROY)
+    e3:SetCondition(s.descon)
+    c:RegisterEffect(e3)
 end
-function c1007010.cfilter2(c)
-	return c:IsFaceup() and c:IsSetCard(0xa20f)
+
+function s.cfilter(c)
+    return c:IsFaceup() and c:IsSetCard(0xa20f)
 end
-function c1007010.con(e)
-	return Duel.IsExistingMatchingCard(c1007010.cfilter2,tp,LOCATION_MZONE,0,1,nil)
+
+function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
+    if chk==0 then 
+        return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 
+            and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil)
+            and Duel.IsPlayerCanSpecialSummonMonster(tp,id,0,0x21,3000,3000,10,RACE_ROCK,ATTRIBUTE_EARTH) 
+    end
+    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
-function c1007010.target(e,tp,eg,ep,ev,re,r,rp,chk,m)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and 
-		Duel.IsPlayerCanSpecialSummonMonster(tp,1007010,0,0x21,3000,3000,10,RACE_ROCK,ATTRIBUTE_EARTH) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
+
+function s.spop(e,tp,eg,ep,ev,re,r,rp)
+    local c=e:GetHandler()
+    if not c:IsRelateToEffect(e) then return end
+    if not Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) then return end
+    if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0
+        or not Duel.IsPlayerCanSpecialSummonMonster(tp,id,0,0x21,3000,3000,10,RACE_ROCK,ATTRIBUTE_EARTH) then return end
+c:AddMonsterAttribute(TYPE_EFFECT+TYPE_TRAP)
+Duel.SpecialSummonStep(c,0,tp,tp,true,false,POS_FACEUP)
+--indestructable battle
+local e1=Effect.CreateEffect(c)
+e1:SetType(EFFECT_TYPE_SINGLE)
+e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+e1:SetValue(1)
+e1:SetReset(RESET_EVENT+0x1fe0000)
+c:RegisterEffect(e1,true)
+--cannot be target
+local e2=Effect.CreateEffect(c)
+e2:SetType(EFFECT_TYPE_FIELD)
+e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
+e2:SetRange(LOCATION_MZONE)
+e2:SetTargetRange(LOCATION_MZONE,0)
+e2:SetTarget(s.tgtg)
+e2:SetValue(aux.tgoval)
+c:RegisterEffect(e2,true)
+local e3=e2:Clone()
+e3:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
+e3:SetValue(aux.imval1)
+c:RegisterEffect(e3,true)
+--destroy
+local e4=Effect.CreateEffect(c)
+e4:SetDescription(aux.Stringid(id,0))
+e4:SetCategory(CATEGORY_DESTROY)
+e4:SetType(EFFECT_TYPE_QUICK_O)
+e4:SetCode(EVENT_FREE_CHAIN)
+e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
+e4:SetRange(LOCATION_MZONE)
+e4:SetCountLimit(1)
+e4:SetTarget(s.destg)
+e4:SetOperation(s.desop)
+c:RegisterEffect(e4,true)
+Duel.SpecialSummonComplete()
 end
-function c1007010.activate(e,tp,eg,ep,ev,re,r,rp,m)
-	local c=nil
-	if m then c=m else c=e:GetHandler() end
-	if not c:IsRelateToEffect(e) then return end
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0
-		or not Duel.IsPlayerCanSpecialSummonMonster(tp,1007010,0,0x21,3000,3000,10,RACE_ROCK,ATTRIBUTE_EARTH) then return end
-	c:AddMonsterAttribute(TYPE_EFFECT+TYPE_TRAP)
-	Duel.SpecialSummonStep(c,0,tp,tp,true,false,POS_FACEUP)
-	c:AddMonsterAttributeComplete()
-	--cannot attack
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-	e1:SetValue(1)
-	e1:SetReset(RESET_EVENT+0x1fe0000)
-	c:RegisterEffect(e1,true)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_CANNOT_BE_BATTLE_TARGET)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(c1007010.imtg)
-	e2:SetValue(aux.imval1)
-	c:RegisterEffect(e2,true)
-	local e3=e2:Clone()
-	e3:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-	e3:SetValue(aux.tgoval)
-	c:RegisterEffect(e3,true)
-	local e4=Effect.CreateEffect(c)
-	e4:SetDescription(aux.Stringid(1007010,1))
-	e4:SetCategory(CATEGORY_DESTROY)
-	e4:SetType(EFFECT_TYPE_QUICK_O)
-	e4:SetCode(EVENT_FREE_CHAIN)
-	e4:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
-	e4:SetHintTiming(TIMING_DAMAGE_STEP,TIMING_DAMAGE_STEP+0x1c0)
-	e4:SetRange(LOCATION_MZONE)
-	e4:SetCountLimit(1)
-	e4:SetTarget(c1007010.tdtg)
-	e4:SetOperation(c1007010.tdop)
-	c:RegisterEffect(e4,true)
-	Duel.SpecialSummonComplete()
+function s.tgtg(e,c)
+    return c:IsSetCard(0xa20f) and c~=e:GetHandler()
 end
-function c1007010.imtg(e,c)
-	return c:IsSetCard(0x20f) and not c:IsCode(1007010)
+function s.desfilter(c)
+    return c:IsSummonType(SUMMON_TYPE_SPECIAL) and c:IsDestructable()
 end
-function c1007010.tdfilter(c)
-	return bit.band(c:GetSummonType(),SUMMON_TYPE_SPECIAL)==SUMMON_TYPE_SPECIAL and c:IsDestructable()
+function s.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+    if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and s.desfilter(chkc) end
+    if chk==0 then return Duel.IsExistingTarget(s.desfilter,tp,0,LOCATION_MZONE,1,nil) end
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
+    local g=Duel.SelectTarget(tp,s.desfilter,tp,0,LOCATION_MZONE,1,1,nil)
+    Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
-function c1007010.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c1007010.tdfilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c1007010.tdfilter,tp,0,LOCATION_MZONE,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectTarget(tp,c1007010.tdfilter,tp,0,LOCATION_MZONE,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
+function s.desop(e,tp,eg,ep,ev,re,r,rp)
+    local tc=Duel.GetFirstTarget()
+    if tc:IsRelateToEffect(e) then
+        Duel.Destroy(tc,REASON_EFFECT)
+    end
 end
-function c1007010.tdop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e)
-	if g:GetCount()>0 then
-		Duel.Destroy(g,REASON_EFFECT)
-	end
-end
-function c1007010.cfilter1(c)
-	return c:IsFaceup() and c:IsSetCard(0xa20f)
-end
-function c1007010.check()
-	return Duel.IsExistingMatchingCard(c1007010.cfilter1,0,LOCATION_MZONE,0,1,nil)
-end
-function c1007010.descon(e)
-	return not c1007010.check()
+function s.descon(e)
+    return not Duel.IsExistingMatchingCard(s.cfilter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil)
 end
\ No newline at end of file
--- a/expansions/strings.conf
+++ b/expansions/strings.conf
@@ -32,6 +32,7 @@
 !setname 0x320f 童话的怪物|魔法使之夜
 !setname 0xa20f 久远寺有珠|魔法使之夜
 !setname 0xc20f 苍崎青子|魔法使之夜
+!counter 0x1245 回路指示物

 #蝶影 2924713558 11 0xe10-0xe1f
 !setname 0xe10 帕西菲卡