得得得得得

expansions/script/c1110111.lua

@@ -75,7 +75,7 @@ function c1110111.op1(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		sg:GetFirst():RegisterEffect(e2)
 	else
-		local sg=Duel.GetMatchingGroup(tp,c1110111.tfilter1_2,tp,0,LOCATION_MZONE,nil,e,tp)
+		local sg=Duel.GetMatchingGroup(c1110111.tfilter1_2,tp,0,LOCATION_MZONE,nil,e,tp)
 		if sg:GetCount()<1 then return end
 		for tc in aux.Next(sg) do
 			local e3=Effect.CreateEffect(c)

expansions/script/c12026016.lua

@@ -44,8 +44,13 @@ function cm.initial_effect(c)
 end
 cm.lighting_with_Raphael=1
 function cm.describe_with_Raphael(c)
+<<<<<<< HEAD
 	local m=_G["c"..c:GetCode()]
 	return m and m.lighting_with_Raphael
+=======
+    local m=_G["c"..c:GetCode()]
+    return m and m.lighting_with_Raphael
+>>>>>>> 5fb5baa63dc999048166d9a9eff386ac5971f9a3
 end
 function cm.chainop(e,tp,eg,ep,ev,re,r,rp)
 	if (re:GetHandler()==e:GetHandler() or re:GetHandler():IsCode(12026000)) and ep==tp then

expansions/script/c12026042.lua

@@ -11,7 +11,7 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCountLimit(1,m)
-	e1:SetRange(LOCATION_HAND)
+	e1:SetRange(LOCATION_PZONE)
 	e1:SetCondition(cm.condition)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)