ybb

expansions/script/c37901004.lua

@@ -93,8 +93,8 @@ function cm.cf1(c)
 end
 --e2
 function cm.tf2(c)
-	return c:IsSetCard(0x388) and c:IsAbleToGrave()
+	return c:IsSetCard(0x388) and c:IsAbleToGrave() and c:IsType(TYPE_MONSTER)
 end
 function cm.tf3(c,tc)
-	return c:IsSetCard(0x388) and c:IsAbleToHand() and c:IsCode(tc)
+	return c:IsSetCard(0x388) and c:IsAbleToHand() and c:IsCode(tc) and c:IsType(TYPE_MONSTER)
 end
\ No newline at end of file

expansions/script/c81048004.lua

@@ -50,6 +50,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local chkf=tp
 	local mg1=Duel.GetMatchingGroup(cm.filter1,tp,LOCATION_GRAVE,0,nil,e)
 	local sg1=Duel.GetMatchingGroup(cm.filter2,tp,LOCATION_EXTRA,0,nil,e,tp,mg1,nil,chkf)
@@ -82,7 +83,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		local fid=c:GetFieldID()
 		tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1,fid)
 		tc:CompleteProcedure()
-		local e1=Effect.CreateEffect(e:GetHandler())
+		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 		e1:SetCode(EVENT_PHASE+PHASE_END)