fix

expansions/script/c11451527.lua

@@ -59,7 +59,7 @@ function cm.initial_effect(c)
 	if not cm.pendulum_link then
 		cm.pendulum_link=true
 		_GetLink=Card.GetLink
-		Card.GetLink=function(tc) if tc==c and tc:IsLocation(LOCATION_PZONE) then return 2 else return _GetLink(tc) end end
+		Card.GetLink=function(tc) if tc:GetOriginalCode()==m and tc:IsLocation(LOCATION_PZONE) then return 2 else return _GetLink(tc) end end
 	end
 end
 function cm.lcheck(g)

expansions/script/c15000604.lua

@@ -31,7 +31,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if e:GetHandler():IsStatus(STATUS_ACT_FROM_HAND) then
 		Duel.PayLPCost(tp,math.floor(Duel.GetLP(tp)/2))
 	end
-	if ((re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:IsActiveType(TYPE_SPELL)) or re:IsActiveType(TYPE_MONSTER)) then
+	if ((re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:IsActiveType(TYPE_TRAP)) or re:IsActiveType(TYPE_MONSTER)) then
 		Duel.PayLPCost(tp,math.floor(Duel.GetLP(tp)/2))
 	end
 end

expansions/script/c25000082.lua

@@ -59,13 +59,13 @@ function cm.imop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_IMMUNE_EFFECT)
 		e1:SetValue(cm.efilter)
-		e1:SetLabel(e)
+		e1:SetLabelObject(re)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 		c:RegisterEffect(e1)
 	end
 end
 function cm.efilter(e,re)
-	return re==e:GetLabel()
+	return re==e:GetLabelObject()
 end
 function cm.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local bc=e:GetHandler():GetBattleTarget()

expansions/script/c33401001.lua

@@ -56,13 +56,14 @@ function cm.srfilter(c)
 end
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+		and e:GetHandler():IsLocation(LOCATION_GRAVE)   end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e)  and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 		end

expansions/script/c33401002.lua

@@ -53,13 +53,14 @@ function cm.srfilter(c)
 end
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+	 and e:GetHandler():IsLocation(LOCATION_GRAVE) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e)  and e:GetHandler():IsLocation(LOCATION_GRAVE) then
 		if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 		end

expansions/script/c33401003.lua

@@ -45,13 +45,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false)
+and e:GetHandler():IsLocation(LOCATION_GRAVE)   end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 		end

expansions/script/c33401004.lua

@@ -50,13 +50,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		 if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 		end

expansions/script/c33401005.lua

@@ -64,13 +64,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		 if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 		end

expansions/script/c33401006.lua

@@ -59,13 +59,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		 if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 		end

expansions/script/c33401007.lua

@@ -67,13 +67,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 			--must attack

expansions/script/c33401008.lua

@@ -117,13 +117,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,500)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		  if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,500,REASON_EFFECT)
 			--must attack

expansions/script/c33401009.lua

@@ -80,13 +80,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,1000)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e)and e:GetHandler():IsLocation(LOCATION_GRAVE)   then
 		  if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,1000,REASON_EFFECT)
 			--must attack

expansions/script/c33401010.lua

@@ -93,13 +93,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,1000)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 			if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,1000,REASON_EFFECT)
 			--must attack

expansions/script/c33401011.lua

@@ -61,7 +61,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
-		Duel.ConfirmCards(1-tp,g)	
+		Duel.ConfirmCards(1-tp,g)   
 	end 
 	local e2=Effect.CreateEffect(e:GetHandler())
 	e2:SetType(EFFECT_TYPE_FIELD)
@@ -114,13 +114,14 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) 
+and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,1000)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 		  if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,1000,REASON_EFFECT)
 			--must attack

expansions/script/c33401035.lua

@@ -105,13 +105,13 @@ end
 
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	  if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and e:GetHandler():IsLocation(LOCATION_GRAVE)  end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,tp,2000)
 end
 function cm.srop(e,tp,eg,ep,ev,re,r,rp)
    local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then
+	if c:IsRelateToEffect(e) and e:GetHandler():IsLocation(LOCATION_GRAVE)  then
 			if  Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0 then
 		Duel.Damage(tp,2000,REASON_EFFECT)
 			--must attack
@@ -190,7 +190,7 @@ function cm.op3(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCategory(CATEGORY_RECOVER)
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e2:SetCode(EVENT_DAMAGE)
-		e2:SetReset(RESET_PHASE+PHASE_END)
+		e2:SetReset(RESET_PHASE+Duel.GetCurrentPhase())
 		e2:SetCondition(cm.con11)
 		e2:SetOperation(cm.op11)
 		Duel.RegisterEffect(e2,tp)