iidx gooooooooooooooooooold

expansions/script/c24300005.lua

@@ -28,7 +28,7 @@ function c24300005.initial_effect(c)
 	e4:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE+EFFECT_FLAG_SET_AVAILABLE)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetTargetRange(LOCATION_MZONE,0)
-	e4:SetTarget(c300005.tglimit)
+	e4:SetTarget(c24300005.tglimit)
 	e4:SetValue(aux.tgoval)
 	c:RegisterEffect(e4)
 end

expansions/script/c24300035.lua

@@ -29,7 +29,7 @@ function c24300035.initial_effect(c)
 
 end
 function c24300035.cfilter(c)
-	return aux.IsCodeListed(c,300021)
+	return aux.IsCodeListed(c,24300021)
 end
 
 function c24300035.cost(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -73,14 +73,16 @@ function c24300035.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=3 end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK)
 end
-
+function c24300035.thfilter(c)
+	return aux.IsCodeListed(c,24300021) and c:IsAbleToHand()
+end
 function c24300035.spop1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.ConfirmDecktop(tp,3)
 	local g=Duel.GetDecktopGroup(tp,3)
 	if g:GetCount()>0 then
-		if g:IsExists(c24300035.cfilter,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(24300035,0)) then
+		if g:IsExists(c24300035.thfilter,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(24300035,0)) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-			local sg=g:FilterSelect(tp,c24300035.cfilter,1,1,nil)
+			local sg=g:FilterSelect(tp,c24300035.thfilter,1,1,nil)
 			Duel.SendtoHand(sg,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,sg)
 			Duel.ShuffleHand(tp)

expansions/script/c33500110.lua

@@ -105,6 +105,6 @@ end
 function cm.filter1(c)
 	return c:IsFaceup() and c:IsSetCard(0xa84) and c:IsType(TYPE_MONSTER)
 end
-function cm.spcon(e,tp)
-	 return Duel.IsExistingMatchingCard(cm.filter1,tp,LOCATION_ONFIELD,0,1,nil)
+function cm.spcon(e)
+	 return Duel.IsExistingMatchingCard(cm.filter1,e:GetOwnerPlayer(),LOCATION_ONFIELD,0,1,nil)
 end
\ No newline at end of file