EMERGENCY

expansions/script/c40009970.lua

@@ -190,13 +190,13 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 			tc=g:GetNext()
 		end
 		Duel.SpecialSummonComplete()
-		c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,fid)
+		c:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE,0,1,fid)
 		g:KeepAlive()
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e1:SetCode(EVENT_PHASE+PHASE_END)
+		e1:SetCode(EVENT_PHASE+PHASE_BATTLE)
 		e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
-		e1:SetReset(RESET_PHASE+PHASE_END)
+		e1:SetReset(RESET_PHASE+PHASE_BATTLE)
 		e1:SetCountLimit(1)
 		e1:SetLabel(fid)
 		e1:SetLabelObject(g)

expansions/script/c40009978.lua

@@ -32,7 +32,7 @@ function cm.initial_effect(c)
 	Duel.RegisterEffect(e4,1)
 end
 function cm.cfilter(c)
-	return cm.BeastDeity(c) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
+	return cm.BeastDeity(c)  and c:IsAbleToRemoveAsCost()
 end
 function cm.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost()

expansions/script/c40009980.lua

@@ -34,7 +34,7 @@ function cm.initial_effect(c)
 	
 end
 function cm.cfilter(c)
-	return cm.BeastDeity(c) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
+	return cm.BeastDeity(c)  and c:IsAbleToRemoveAsCost()
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost()

expansions/script/c40009983.lua

@@ -19,11 +19,11 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e1)	
 end
 function cm.tdfilter(c,tp)
-	return cm.BeastDeity(c) and not c:IsPublic() and c:IsAbleToDeck()
+	return cm.BeastDeity(c) and c:IsType(TYPE_MONSTER) and not c:IsPublic() and c:IsAbleToDeck()
 		and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil,c:GetCode())
 end
 function cm.thfilter(c,code)
-	return cm.BeastDeity(c) and not c:IsCode(code) and c:IsAbleToHand()
+	return cm.BeastDeity(c) and not c:IsCode(code) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tdfilter,tp,LOCATION_HAND,0,1,nil,tp) end

expansions/script/c40009996.lua

@@ -50,13 +50,8 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
 	local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil)
-	local tc=g:GetFirst()
-	if tc and Duel.SSet(tp,tc)~=0 then
-		local e1=Effect.CreateEffect(e:GetHandler())
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_CANNOT_TRIGGER)
-		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-		tc:RegisterEffect(e1)
+	if g:GetCount()>0 then
+		Duel.SSet(tp,g:GetFirst())
 	end
 end
 function cm.repfilter(c,tp)