fixes

expansions/script/c81006014.lua

@@ -15,7 +15,7 @@ function c81006014.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_HAND)
-	e1:SetHintTiming(0,TIMING_MAIN_END)
+	e1:SetHintTiming(0,TIMING_MAIN_END+TIMINGS_CHECK_MONSTER)
 	e1:SetCondition(c81006014.spcon)
 	e1:SetCost(c81006014.spcost)
 	e1:SetTarget(c81006014.sptg)
@@ -23,7 +23,7 @@ function c81006014.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c81006014.rellimit(e,c,tp,sumtp)
-	return c:IsControler(tp) and c:IsType(TYPE_MONSTER)
+	return c:GetOwner()==e:GetHandler():GetOwner() and c:IsType(TYPE_MONSTER)
 end
 function c81006014.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2

expansions/script/c960009.lua

@@ -4,7 +4,7 @@ function c960009.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetHintTiming(0,TIMING_END_PHASE)
+	e1:SetHintTiming(0,TIMING_ATTACK+TIMING_BATTLE_START+TIMINGS_CHECK_MONSTER)
 	e1:SetCountLimit(1,960009)
 	e1:SetCost(c960009.cost)
 	e1:SetOperation(c960009.activate)
@@ -26,23 +26,27 @@ function c960009.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.PayLPCost(tp,500)
 end
 function c960009.activate(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local e1=Effect.CreateEffect(c)
+	--local c=e:GetHandler()
+	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_AVOID_BATTLE_DAMAGE)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e1:SetTargetRange(1,0)
+	e1:SetTargetRange(1,1)
 	e1:SetValue(1)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e3:SetRange(LOCATION_MZONE)
-	e3:SetCode(EFFECT_IMMUNE_EFFECT)
-	e3:SetValue(c960009.efilter)
-	e3:SetReset(RESET_EVENT+RESETS_STANDARD)
-	Duel.RegisterEffect(e3,tp)
+
+
+	local e1=Effect.CreateEffect(e:GetHandler())
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetCode(EFFECT_IMMUNE_EFFECT)
+	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e1:SetTarget(c960009.etarget)
+	e1:SetValue(c960009.efilter)
+	e1:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e1,tp)
+
+
 	Duel.Hint(HINT_MUSIC,0,aux.Stringid(960009,0)) 
 end
 function c960009.thfilter(c)
@@ -61,5 +65,9 @@ function c960009.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c960009.efilter(e,te)
-	return te:GetOwner()~=e:GetOwner()
-end
\ No newline at end of file
+	return te:GetHandler()~=e:GetHandler()
+end
+
+function c960009.etarget(e,c)
+	return true
+end

expansions/script/c9980445.lua

@@ -93,7 +93,7 @@ function c9980445.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c9980445.cfilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function c9980445.spfilter(c,e,tp)
-	return c:IsSetCard(0x1bca) and c:IsLevelBelow(2) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x2bcb) and c:IsLevelBelow(2) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c9980445.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c9980445.spfilter(chkc,e,tp) end