byd

expansions/script/c96037004.lua

@@ -52,19 +52,19 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
 		e1:SetValue(1)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-		tc:RegisterEffect(e1)
+		tc:RegisterEffect(e1,true)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetCode(EFFECT_CANNOT_DISABLE)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
-		tc:RegisterEffect(e2)
+		tc:RegisterEffect(e2,true)
 		local e3=Effect.CreateEffect(c)
 		e3:SetType(EFFECT_TYPE_FIELD)
 		e3:SetCode(EFFECT_CANNOT_DISEFFECT)
 		e3:SetRange(LOCATION_MZONE)
 		e3:SetValue(cm.efilter)
 		e3:SetReset(RESET_EVENT+RESETS_STANDARD)
-		tc:RegisterEffect(e3)
+		tc:RegisterEffect(e3,true)
 		Duel.SpecialSummonComplete()	
 		local fid=e:GetHandler():GetFieldID()
 		tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,1,fid)

expansions/script/c96038003.lua

@@ -100,14 +100,15 @@ function cm.sumfilter(c)
 	return c:IsSummonable(true,nil) and c:IsRace(RACE_FAIRY+RACE_FIEND+RACE_ZOMBIE)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SendtoHand(c,nil,REASON_EFFECT)~=0 and c:IsLocation(LOCATION_HAND) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(m,3)) then
-		Duel.ShuffleHand(tp)
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
-		local g=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND,0,1,1,nil)
-		if g:GetCount()>0 then
-			Duel.Summon(tp,g:GetFirst(),true,nil)
+	local tg=Duel.GetFirstMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,nil)
+	if tg and Duel.SendtoHand(tg,nil,REASON_EFFECT)~=0
+		and  Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(m,3)) then
+			Duel.ShuffleHand(tp)
+			Duel.BreakEffect()
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
+			local g=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND,0,1,1,nil)
+			if g:GetCount()>0 then
+				Duel.Summon(tp,g:GetFirst(),true,nil)
 		end
 	end
 end