ybb

expansions/script/c16400096.lua

@@ -10,7 +10,7 @@ function cm.initial_effect(c)
 	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_SZONE)
-	e2:SetCountLimit(1,m)
+	e2:SetCountLimit(1,m+100)
 	e2:SetCondition(cm.sscon)
 	e2:SetCost(cm.sscost)
 	e2:SetTarget(cm.sstg)
@@ -22,7 +22,7 @@ function cm.initial_effect(c)
 	e4:SetCategory(CATEGORY_DAMAGE+CATEGORY_DEFCHANGE)
 	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e4:SetCode(EVENT_PHASE+PHASE_END)
-	e4:SetCountLimit(1,m)
+	e4:SetCountLimit(1)
 	e4:SetCondition(cm.con)
 	e4:SetTarget(cm.destg)
 	e4:SetOperation(cm.desop)
@@ -32,12 +32,12 @@ function cm.filter(c,e,tp)
 	return (c:IsSetCard(0x389) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0) and (c:IsSetCard(0x1ce1) and c:IsAbleToHand())
 end
 function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_MZONE,0,1,nil,e,tp) end
+	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function cm.thop(e,tp)
-	if Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_MZONE,0,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
+	if Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELECT)
 		local sg=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 		if sg:GetCount()>0 then

expansions/script/c33501309.lua

@@ -103,8 +103,8 @@ function cm.efop(e,tp,eg,ep,ev,re,r,rp)
 	while wbc do
 		local code=wbc:GetOriginalCode()
 		if c:IsFaceup() and c:GetFlagEffect(code)==0 then
-		c:CopyEffect(code,RESET_EVENT+0x1fe0000+EVENT_CHAINING,1)
-		c:RegisterFlagEffect(code,RESET_EVENT+0x1fe0000+EVENT_CHAINING,0,1)  
+			c:CopyEffect(code,RESET_EVENT+0x1fe0000+EVENT_CHAIN_SOLVED,1)
+			c:RegisterFlagEffect(code,RESET_EVENT+0x1fe0000+EVENT_CHAIN_SOLVED,0,1)
 		end 
 		wbc=wg:GetNext()
 	end