fix 鬼動武者

c12735388.lua

 --レインボー・ヴェール
+local s,id,o=GetID()
 function c12735388.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
@@ -22,15 +23,15 @@ function c12735388.initial_effect(c)
 	e3:SetCode(EVENT_BE_BATTLE_TARGET)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e3:SetCondition(c12735388.discon1)
-	e3:SetOperation(c12735388.disop1)
+	e3:SetCondition(s.discon1)
+	e3:SetOperation(s.disop1)
 	c:RegisterEffect(e3)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)
 	e4:SetCode(EFFECT_DISABLE)
 	e4:SetRange(LOCATION_SZONE)
 	e4:SetTargetRange(0,LOCATION_MZONE)
-	e4:SetTarget(c12735388.distg)
+	e4:SetTarget(s.distg)
 	c:RegisterEffect(e4)
 	local e5=e4:Clone()
 	e5:SetCode(EFFECT_DISABLE_EFFECT)
@@ -49,16 +50,16 @@ function c12735388.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,e:GetHandler(),tc)
 	end
 end
-function c12735388.discon1(e,tp,eg,ep,ev,re,r,rp)
+function s.discon1(e,tp,eg,ep,ev,re,r,rp)
 	local ec=e:GetHandler():GetEquipTarget()
 	return ec and (ec==Duel.GetAttacker() or ec==Duel.GetAttackTarget()) and ec:GetBattleTarget()
 end
-function c12735388.disop1(e,tp,eg,ep,ev,re,r,rp)
+function s.disop1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=c:GetEquipTarget():GetBattleTarget()
-	tc:RegisterFlagEffect(12735388,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE,0,1)
+	tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE,0,1)
 	Duel.AdjustInstantly(c)
 end
-function c12735388.distg(e,c)
-	return c:GetFlagEffect(12735388)~=0
+function s.distg(e,c)
+	return c:GetFlagEffect(id)~=0
 end

c40509732.lua

 --鬼動武者
+local s,id,o=GetID()
 function c40509732.initial_effect(c)
 	--synchro summon
 	c:EnableReviveLimit()
@@ -15,20 +16,19 @@ function c40509732.initial_effect(c)
 	c:RegisterEffect(e1)
 	--disable
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_ATTACK_ANNOUNCE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_BE_BATTLE_TARGET)
+	e2:SetRange(LOCATION_MZONE)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetOperation(c40509732.disop)
+	e2:SetCondition(s.discon1)
+	e2:SetOperation(s.disop1)
 	c:RegisterEffect(e2)
-	local e3=e2:Clone()
-	e3:SetCode(EVENT_BE_BATTLE_TARGET)
-	c:RegisterEffect(e3)
 	local e6=Effect.CreateEffect(c)
 	e6:SetType(EFFECT_TYPE_FIELD)
 	e6:SetCode(EFFECT_DISABLE)
 	e6:SetRange(LOCATION_MZONE)
 	e6:SetTargetRange(0,LOCATION_MZONE)
-	e6:SetTarget(c40509732.distg)
+	e6:SetTarget(s.distg)
 	c:RegisterEffect(e6)
 	local e7=e6:Clone()
 	e7:SetCode(EFFECT_DISABLE_EFFECT)
@@ -49,14 +49,18 @@ function c40509732.actcon(e)
 	local c=e:GetHandler()
 	return (Duel.GetAttacker()==c and c:GetBattleTarget()) or Duel.GetAttackTarget()==c
 end
-function c40509732.disop(e,tp,eg,ep,ev,re,r,rp)
-	local tc=e:GetHandler():GetBattleTarget()
-	if not tc then return end
-	tc:RegisterFlagEffect(40509732,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE,0,1)
-	Duel.AdjustInstantly(e:GetHandler())
+function s.discon1(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	return (c==Duel.GetAttacker() or c==Duel.GetAttackTarget()) and c:GetBattleTarget()
+end
+function s.disop1(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	local tc=c:GetBattleTarget()
+	tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE,0,1)
+	Duel.AdjustInstantly(c)
 end
-function c40509732.distg(e,c)
-	return c:GetFlagEffect(40509732)~=0
+function s.distg(e,c)
+	return c:GetFlagEffect(id)~=0
 end
 function c40509732.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()