change

c31053337.lua

@@ -20,10 +20,12 @@ function c31053337.initial_effect(c)
 	c:RegisterEffect(e2)
 	--indes
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_DAMAGE_CALCULATING)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	e3:SetRange(LOCATION_MZONE)
-	e3:SetOperation(c31053337.indes)
+	e3:SetTargetRange(0,LOCATION_MZONE)
+	e3:SetTarget(c31053337.indestg)
+	e3:SetValue(1)
 	c:RegisterEffect(e3)
 	--to hand2
 	local e4=Effect.CreateEffect(c)
@@ -59,17 +61,8 @@ function c31053337.operation(e,tp,eg,ep,ev,re,r,rp)
 		c:RegisterEffect(e1)
 	end
 end
-function c31053337.indes(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local bc=c:GetBattleTarget()
-	if bc then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-		e1:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-		e1:SetValue(1)
-		bc:RegisterEffect(e1)
-	end
+function c31053337.indestg(e,c)
+	return c==e:GetHandler():GetBattleTarget()
 end
 function c31053337.operation2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c65079854.lua

@@ -27,14 +27,16 @@ function c65079854.initial_effect(c)
 	e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e4:SetValue(c65079854.eqlimit)
 	c:RegisterEffect(e4)
-	--battle
+	--indes
 	local e5=Effect.CreateEffect(c)
-	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e5:SetType(EFFECT_TYPE_FIELD)
+	e5:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	e5:SetRange(LOCATION_SZONE)
-	e5:SetCode(EVENT_DAMAGE_CALCULATING)
-	e5:SetCondition(c65079854.indescon)
-	e5:SetOperation(c65079854.indesop)
+	e5:SetTargetRange(0,LOCATION_MZONE)
+	e5:SetTarget(c65079854.indestg)
+	e5:SetValue(1)
 	c:RegisterEffect(e5)
+	--battle
 	local e6=Effect.CreateEffect(c)
 	e6:SetDescription(aux.Stringid(65079854,0))
 	e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
@@ -64,17 +66,8 @@ function c65079854.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,c,tc)
 	end
 end
-function c65079854.indescon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetEquipTarget():GetBattleTarget()~=nil
-end
-function c65079854.indesop(e,tp,eg,ep,ev,re,r,rp)
-	local bc=e:GetHandler():GetEquipTarget():GetBattleTarget()
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-	e1:SetValue(1)
-	e1:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-	bc:RegisterEffect(e1,true)
+function c65079854.indestg(e,c)
+	return c==e:GetHandler():GetEquipTarget():GetBattleTarget()
 end
 function c65079854.adcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetAttacker()==e:GetHandler():GetEquipTarget() and Duel.GetAttackTarget()~=nil

c81167171.lua

@@ -42,32 +42,16 @@ function c81167171.condition(e,tp,eg,ep,ev,re,r,rp)
 end
 function c81167171.activate(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_DAMAGE_CALCULATING)
-	e1:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-	e1:SetOperation(c81167171.batop)
-	Duel.RegisterEffect(e1,tp)
-end
-function c81167171.batop(e,tp,eg,ep,ev,re,r,rp)
-	local s=Duel.GetAttacker()
-	local o=Duel.GetAttackTarget()
-	if Duel.GetTurnPlayer()~=tp then
-		s=Duel.GetAttackTarget()
-		o=Duel.GetAttacker()
-	end
-	if not o then return end
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_NO_BATTLE_DAMAGE)
+	e1:SetTargetRange(0,LOCATION_MZONE)
 	e1:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-	o:RegisterEffect(e1)
-	if s then
-		local e2=Effect.CreateEffect(e:GetHandler())
-		e2:SetType(EFFECT_TYPE_SINGLE)
-		e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-		e2:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-		e2:SetValue(1)
-		s:RegisterEffect(e2)
-	end
-	e:Reset()
+	Duel.RegisterEffect(e1,tp)
+	local e2=Effect.CreateEffect(e:GetHandler())
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
+	e2:SetTargetRange(LOCATION_MZONE,0)
+	e2:SetValue(1)
+	e2:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
+	Duel.RegisterEffect(e2,tp)
 end

c8198620.lua

@@ -21,13 +21,14 @@ function c8198620.initial_effect(c)
 	e2:SetTarget(c8198620.attg)
 	e2:SetOperation(c8198620.atop)
 	c:RegisterEffect(e2)
-	--
+	--indes
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	e3:SetRange(LOCATION_MZONE)
-	e3:SetCode(EVENT_DAMAGE_CALCULATING)
-	e3:SetCondition(c8198620.indescon)
-	e3:SetOperation(c8198620.indesop)
+	e3:SetTargetRange(0,LOCATION_MZONE)
+	e3:SetTarget(c8198620.indestg)
+	e3:SetValue(1)
 	c:RegisterEffect(e3)
 end
 function c8198620.splimit(e,se,sp,st)
@@ -69,15 +70,6 @@ function c8198620.atop(e,tp,eg,ep,ev,re,r,rp)
 		end
 	end
 end
-function c8198620.indescon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetBattleTarget()~=nil
-end
-function c8198620.indesop(e,tp,eg,ep,ev,re,r,rp)
-	local bc=e:GetHandler():GetBattleTarget()
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
-	e1:SetValue(1)
-	e1:SetReset(RESET_PHASE+PHASE_DAMAGE_CAL)
-	bc:RegisterEffect(e1,true)
+function c8198620.indestg(e,c)
+	return c==e:GetHandler():GetBattleTarget()
 end