fix conflict

expansions/script/c77765002.lua

@@ -14,18 +14,18 @@ function c77765002.initial_effect(c)
 	--
 	 local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
-    e1:SetCategory(CATEGORY_TOGRAVE)
+	e1:SetCategory(CATEGORY_TOGRAVE)
 	e1:SetRange(LOCATION_FZONE)
 	e1:SetCountLimit(1)
 	e1:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk)
 		if chk==0 then return Duel.GetLocationCount(1-tp,LOCATION_SZONE,tp)>0 and Duel.IsExistingMatchingCard(c77765002.filter1,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil,tp) end
-        Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,LOCATION_DECK+LOCATION_HAND,tp)
+		Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,LOCATION_DECK+LOCATION_HAND,tp)
 	end)
 	e1:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.GetLocationCount(1-tp,LOCATION_SZONE,tp)<=0 then return end
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		 local g=Duel.SelectMatchingCard(tp,c77765002.filter1,tp,LOCATION_DECK+LOCATION_HAND,0,1,1,nil,tp)
-         if #g==0 then return end
+		 if #g==0 then return end
 		 Duel.SendtoGrave(g,REASON_EFFECT)
 		local sc=g:GetFirst()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
@@ -58,11 +58,7 @@ function c77765002.initial_effect(c)
 		local tc=Duel.CreateToken(tp,code)
 		Duel.DisableActionCheck(false)
 		if tc then
-<<<<<<< HEAD
 			return c:IsFaceup() and c:IsCode(77765001) and Duel.GetLocationCount(p,LOCATION_SZONE,tp)>0 --and tc:CheckEquipTarget(c)
-=======
-			return c:IsFaceup() and c:IsCode(77765001) and Duel.GetLocationCount(p,LOCATION_SZONE,tp)>0 and tc:CheckEquipTarget(c)
->>>>>>> e8817f1011ef690e10f70938650b5ef260ef8722
 		else	
 			return false
 		end

expansions/script/c77765004.lua

@@ -34,7 +34,7 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	--e1:SetCode(EVENT_FREE_CHAIN)
 	--e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER)
-    e1:SetRange(LOCATION_SZONE)
+	e1:SetRange(LOCATION_SZONE)
 	e1:SetCountLimit(1)
 	e1:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk)
 		if chk==0 then return true end
@@ -75,11 +75,7 @@ function cm.initial_effect(c)
 		local tc=Duel.CreateToken(tp,code)
 		Duel.DisableActionCheck(false)
 		if tc then
-<<<<<<< HEAD
 			return c:IsFaceup() and c:IsCode(77765001) and Duel.GetLocationCount(p,LOCATION_SZONE,tp)>0 --and tc:CheckEquipTarget(c)
-=======
-			return c:IsFaceup() and c:IsCode(77765001) and Duel.GetLocationCount(p,LOCATION_SZONE,tp)>0 and tc:CheckEquipTarget(c)
->>>>>>> e8817f1011ef690e10f70938650b5ef260ef8722
 		else	
 			return false
 		end

expansions/script/c77765007.lua

@@ -13,21 +13,13 @@ function cm.initial_effect(c)
 		local tc=Duel.CreateToken(tp,code)
 		Duel.DisableActionCheck(false)
 		if tc then
-<<<<<<< HEAD
 			return c:IsFaceup() and c:IsCode(77765001) and Duel.GetLocationCount(p,LOCATION_SZONE,tp)>0 --and tc:CheckEquipTarget(c)
 		else	
 			return false
 		end
-=======
-			return c:IsFaceup() and c:IsCode(77765001) and Duel.GetLocationCount(p,LOCATION_SZONE,tp)>0 and tc:CheckEquipTarget(c)
-		else	
-			return false
-		end
-		return c:IsFaceup() and c:IsCode(77765001) and Duel.GetLocationCount(p,LOCATION_SZONE,tp)>0 and tc:CheckEquipTarget(c) and (cc:IsControler(c:GetControler()) or c:IsAbleToChangeControler())
->>>>>>> e8817f1011ef690e10f70938650b5ef260ef8722
 	end
 	local function DifficultyFilter(c,e,tp)
-		return Kaguya.IsDifficulty(c) and c:IsFaceup() and c and Duel.IsExistingMatchingCard(KaguyaFilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,e,tp,c)
+		return Kaguya.IsDifficulty(c) and c:IsFaceup() and Senya.IsDFCTransformable(c) and Duel.IsExistingMatchingCard(KaguyaFilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,e,tp,c)
 	end
 	local target_list={
 		function(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -106,7 +98,6 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetCountLimit(1,m)
 	e1:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
 		return Duel.IsExistingMatchingCard(function(c)
 			return Kaguya.IsDifficulty(c) and c:IsFaceup()