fix

expansions/script/c11451531.lua

@@ -64,13 +64,13 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE_START,0,2)
 	else
 		e2:SetReset(RESET_PHASE+PHASE_BATTLE_START)
-		c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE_START,0,1)
+		c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE_START,0,1,c:GetFieldID())
 	end
 	Duel.RegisterEffect(e2,tp)
 end
 function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then
+	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
 		e:Reset()
 		return false
 	else

expansions/script/c11451532.lua

@@ -70,7 +70,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then
+	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
 		e:Reset()
 		return false
 	else

expansions/script/c11451533.lua

@@ -79,7 +79,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then
+	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
 		e:Reset()
 		return false
 	else

expansions/script/c11451534.lua

@@ -103,7 +103,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then
+	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
 		e:Reset()
 		return false
 	else

expansions/script/c11451535.lua

@@ -65,7 +65,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then
+	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
 		e:Reset()
 		return false
 	else

expansions/script/c11451536.lua

@@ -66,7 +66,7 @@ function cm.adop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or (c:GetOriginalCode()~=m and not c:IsStatus(STATUS_COPYING_EFFECT)) then
+	if c:GetFlagEffect(m)==0 or not c:IsLocation(LOCATION_HAND) or c:GetFlagEffectLabel(m)~=c:GetFieldID() then
 		e:Reset()
 		return false
 	else

expansions/script/c11451651.lua

 --lavafissure of dragon palace
 --21.12.25
-local m=11451651
-local cm=_G["c"..m]
+local cm,m=GetID()
 function cm.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
@@ -45,12 +44,12 @@ function cm.initial_effect(c)
 		Duel.RegisterEffect(ge2,0)
 		local ge3=ge2:Clone()
 		ge3:SetCode(EVENT_CHAIN_NEGATED)
-		c:RegisterEffect(ge3,0)
+		Duel.RegisterEffect(ge3,0)
 		local ge4=ge1:Clone()
 		ge4:SetCode(EVENT_CHAIN_NEGATED)
 		ge4:SetCondition(cm.rscon)
 		ge4:SetOperation(cm.reset)
-		c:RegisterEffect(ge4,0)
+		Duel.RegisterEffect(ge4,0)
 	end
 end
 function cm.check(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c11451741.lua

 --天球流转的羽之隙
-local m=11451741
-local cm=_G["c"..m]
+local cm,m=GetID()
 function cm.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
@@ -45,12 +44,12 @@ function cm.initial_effect(c)
 		Duel.RegisterEffect(ge2,0)
 		local ge3=ge2:Clone()
 		ge3:SetCode(EVENT_CHAIN_NEGATED)
-		c:RegisterEffect(ge3,0)
+		Duel.RegisterEffect(ge3,0)
 		local ge4=ge1:Clone()
 		ge4:SetCode(EVENT_CHAIN_NEGATED)
 		ge4:SetCondition(cm.rscon)
 		ge4:SetOperation(cm.reset)
-		c:RegisterEffect(ge4,0)
+		Duel.RegisterEffect(ge4,0)
 	end
 end
 function cm.check(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c117066828.lua

 function c117066828.initial_effect(c)
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_SPSUMMON_PROC)	
-	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)
-	e1:SetRange(LOCATION_HAND)
-	e1:SetCondition(c117066828.spcon)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,117066828)
-	e2:SetCost(c117066828.spcost)
-	e2:SetTarget(c117066828.target)
-	e2:SetOperation(c117066828.operation)
-	c:RegisterEffect(e2)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_BE_MATERIAL)
-	e3:SetCondition(c117066828.efcon)
-	e3:SetOperation(c117066828.efop)
-	c:RegisterEffect(e3)
+    local e1=Effect.CreateEffect(c)
+    e1:SetType(EFFECT_TYPE_FIELD)
+    e1:SetCode(EFFECT_SPSUMMON_PROC)    
+    e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)
+    e1:SetRange(LOCATION_HAND)
+    e1:SetCondition(c117066828.spcon)
+    c:RegisterEffect(e1)
+    local e2=Effect.CreateEffect(c)
+    e2:SetType(EFFECT_TYPE_IGNITION)
+    e2:SetRange(LOCATION_MZONE)
+    e2:SetCountLimit(1,117066828)
+    e2:SetCost(c117066828.spcost)
+    e2:SetTarget(c117066828.target)
+    e2:SetOperation(c117066828.operation)
+    c:RegisterEffect(e2)
+    local e3=Effect.CreateEffect(c)
+    e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+    e3:SetCode(EVENT_BE_MATERIAL)
+    e3:SetCondition(c117066828.efcon)
+    e3:SetOperation(c117066828.efop)
+    c:RegisterEffect(e3)
 end
 function c117066828.spfilter(c)
-	return c:IsSetCard(0x86) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
+    return c:IsSetCard(0x86) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
 end
 function c117066828.spcon(e,c)
-	if c==nil then return true end
-	return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c117066828.spfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
+    if c==nil then return true end
+    return Duel.GetLocationCount(c:GetControler(),LOCATION_MZONE)>0
+        and Duel.IsExistingMatchingCard(c117066828.spfilter,c:GetControler(),LOCATION_MZONE,0,1,nil)
 end
 function c117066828.spcostfilter(c)
-	return c:IsSetCard(0x86) and c:IsType(TYPE_MONSTER) and c:IsAbleToGraveAsCost()
+    return c:IsSetCard(0x86) and c:IsType(TYPE_MONSTER) and c:IsAbleToGraveAsCost()
 end
 function c117066828.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(c117066828.spcostfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil) end
-	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD,nil)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,c117066828.spcostfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil)
-	Duel.SendtoGrave(g,REASON_COST)
-	e:SetLabelObject(g:GetFirst())
+    if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(c117066828.spcostfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil) end
+    Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD,nil)
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+    local g=Duel.SelectMatchingCard(tp,c117066828.spcostfilter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil)
+    Duel.SendtoGrave(g,REASON_COST)
+    e:SetLabelObject(g:GetFirst())
 end
 function c117066828.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+    if chk==0 then return true end
 end
 function c117066828.operation(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local tc=e:GetLabelObject()
-	if c:IsRelateToEffect(e) and c:IsFaceup() then
-		local e1=Effect.CreateEffect(c)
-		e1:SetCategory(CATEGORY_ATKCHANGE)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-		e1:SetCode(EFFECT_UPDATE_ATTACK)
-		e1:SetValue(tc:GetBaseAttack())
-		e1:SetReset(RESET_EVENT+0x1fe0000)
-		c:RegisterEffect(e1)
-		c:CopyEffect(tc:GetOriginalCode(),RESET_EVENT+0x1fe0000,1)
-	end
+    local c=e:GetHandler()
+    local tc=e:GetLabelObject()
+    if c:IsRelateToEffect(e) and c:IsFaceup() then
+        local e1=Effect.CreateEffect(c)
+        e1:SetType(EFFECT_TYPE_SINGLE)
+        e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+        e1:SetCode(EFFECT_UPDATE_ATTACK)
+        e1:SetValue(tc:GetBaseAttack())
+        e1:SetReset(RESET_EVENT+0x1fe0000)
+        c:RegisterEffect(e1)
+        c:CopyEffect(tc:GetOriginalCode(),RESET_EVENT+0x1fe0000,1)
+    end
 end
 function c117066828.efcon(e,tp,eg,ep,ev,re,r,rp)
-	return r==REASON_XYZ and e:GetHandler():GetReasonCard():GetMaterial():IsExists(Card.IsPreviousLocation,3,nil,LOCATION_MZONE)
+    return r==REASON_XYZ and e:GetHandler():GetReasonCard():GetMaterial():IsExists(Card.IsPreviousLocation,3,nil,LOCATION_MZONE)
 end
 function c117066828.efop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_CARD,0,117066828)
-	local c=e:GetHandler()
-	local rc=c:GetReasonCard()
-	local e1=Effect.CreateEffect(rc)
-	e1:SetDescription(aux.Stringid(117066828,0))
-	e1:SetCategory(CATEGORY_ATKCHANGE)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e1:SetCondition(c117066828.atkcon)
-	e1:SetOperation(c117066828.atkop)
-	e1:SetReset(RESET_EVENT+0x1fe0000)
-	rc:RegisterEffect(e1,true)
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(117066828,1))
-	e2:SetCategory(CATEGORY_DESTROY)
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetRange(LOCATION_MZONE)
-	e2:SetCode(EVENT_FREE_CHAIN)
-	e2:SetCountLimit(1)
-	e2:SetCost(c117066828.cost)
-	e2:SetTarget(c117066828.target1)
-	e2:SetOperation(c117066828.operation1)
-	e2:SetReset(RESET_EVENT+0x1fe0000)
-	rc:RegisterEffect(e2,true)
-	if not rc:IsType(TYPE_EFFECT) then
-		local e3=Effect.CreateEffect(c)
-		e3:SetType(EFFECT_TYPE_SINGLE)
-		e3:SetCode(EFFECT_ADD_TYPE)
-		e3:SetValue(TYPE_EFFECT)
-		e3:SetReset(RESET_EVENT+0x1fe0000)
-		rc:RegisterEffect(e3,true)
-	end
+    Duel.Hint(HINT_CARD,0,117066828)
+    local c=e:GetHandler()
+    local rc=c:GetReasonCard()
+    local e1=Effect.CreateEffect(rc)
+    e1:SetDescription(aux.Stringid(117066828,0))
+    e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+    e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+    e1:SetCondition(c117066828.atkcon)
+    e1:SetOperation(c117066828.atkop)
+    e1:SetReset(RESET_EVENT+0x1fe0000)
+    rc:RegisterEffect(e1,true)
+    local e2=Effect.CreateEffect(c)
+    e2:SetDescription(aux.Stringid(117066828,1))
+    e2:SetCategory(CATEGORY_DESTROY)
+    e2:SetType(EFFECT_TYPE_QUICK_O)
+    e2:SetRange(LOCATION_MZONE)
+    e2:SetCode(EVENT_FREE_CHAIN)
+    e2:SetCountLimit(1)
+    e2:SetCost(c117066828.cost)
+    e2:SetTarget(c117066828.target1)
+    e2:SetOperation(c117066828.operation1)
+    e2:SetReset(RESET_EVENT+0x1fe0000)
+    rc:RegisterEffect(e2,true)
+    if not rc:IsType(TYPE_EFFECT) then
+        local e3=Effect.CreateEffect(c)
+        e3:SetType(EFFECT_TYPE_SINGLE)
+        e3:SetCode(EFFECT_ADD_TYPE)
+        e3:SetValue(TYPE_EFFECT)
+        e3:SetReset(RESET_EVENT+0x1fe0000)
+        rc:RegisterEffect(e3,true)
+    end
 end
 function c117066828.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
+    return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c117066828.atkop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and c:IsFaceup() then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_UPDATE_ATTACK)
-		e1:SetValue(1000)
-		e1:SetReset(RESET_EVENT+0x1ff0000)
-		c:RegisterEffect(e1)
-	end
+    local c=e:GetHandler()
+    if c:IsRelateToEffect(e) and c:IsFaceup() then
+        local e1=Effect.CreateEffect(c)
+        e1:SetType(EFFECT_TYPE_SINGLE)
+        e1:SetCode(EFFECT_UPDATE_ATTACK)
+        e1:SetValue(1000)
+        e1:SetReset(RESET_EVENT+0x1ff0000)
+        c:RegisterEffect(e1)
+    end
 end
 function c117066828.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
+    if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
+    e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c117066828.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,0,0,1)
+    if chk==0 then return true end
+    Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,0,0,1)
 end
 function c117066828.operation1(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
-	if g:GetCount()>0 then
-		Duel.HintSelection(g)
-		Duel.Destroy(g,REASON_EFFECT)
-	end
+    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
+    local g=Duel.SelectMatchingCard(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
+    if g:GetCount()>0 then
+        Duel.HintSelection(g)
+        Duel.Destroy(g,REASON_EFFECT)
+    end
 end
\ No newline at end of file

expansions/script/c40010483.lua

@@ -11,7 +11,7 @@ function cm.initial_effect(c)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCode(EFFECT_CANNOT_TRIGGER)
 	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetTargetRange(0,LOCATION_MZONE)
+	e1:SetTargetRange(0,LOCATION_MZONE+LOCATION_GRAVE)
 	e1:SetTarget(cm.actfilter)
 	c:RegisterEffect(e1)
 	--atk change

expansions/script/c67200437.lua

@@ -33,19 +33,21 @@ function c67200437.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c67200437.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	
 		Duel.BreakEffect()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 		local g=Duel.SelectMatchingCard(tp,c67200437.pfilter,tp,LOCATION_HAND,0,1,1,nil,tp)
 		if g:GetCount()>0 then
 			if Duel.MoveToField(g:GetFirst(),tp,tp,LOCATION_PZONE,POS_FACEUP,true)~=0 then
-				local e2=Effect.CreateEffect(c)
-				e2:SetType(EFFECT_TYPE_SINGLE)
-				e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
-				e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-				e2:SetReset(RESET_EVENT+RESETS_REDIRECT)
-				e2:SetValue(LOCATION_HAND)
-				c:RegisterEffect(e2,true)
+				if g:GetFirst():AddCounter(0x671,2)~=0 then
+					local e2=Effect.CreateEffect(c)
+					e2:SetType(EFFECT_TYPE_SINGLE)
+					e2:SetCode(EFFECT_LEAVE_FIELD_REDIRECT)
+					e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+					e2:SetReset(RESET_EVENT+RESETS_REDIRECT)
+					e2:SetValue(LOCATION_HAND)
+					c:RegisterEffect(e2,true)
+				end
 			end
 		end
 	end

expansions/script/c89390003.lua

@@ -73,7 +73,7 @@ function cm.gyfilter(c)
     return c:IsRace(RACE_PSYCHO) and c:IsAbleToDeck()
 end
 function cm.destg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.IsExistingMatchingCard(cm.gyfilter,tp,LOCATION_REMOVED,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_HAND,1,nil) end
+    if chk==0 then return Duel.IsExistingMatchingCard(cm.gyfilter,tp,LOCATION_REMOVED,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,0,LOCATION_HAND,1,nil) and Duel.IsPlayerCanDraw(tp,1) and Duel.IsPlayerCanDraw(1-tp,1) end
     Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_REMOVED)
     Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_HAND)
     Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)