duiduiduiduidui

expansions/script/c47390105.lua

@@ -10,10 +10,17 @@ function s.spsummon(c)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_HAND)
 	e1:SetCountLimit(1,id)
+	e1:SetCondition(s.hspcon)
 	e1:SetTarget(s.hsptg)
 	e1:SetOperation(s.hspop)
 	c:RegisterEffect(e1)
 end
+function s.spfilter(c)
+	return c:IsFaceup() and aux.IsCodeListed(c,47390101) and c:IsType(TYPE_MONSTER)
+end
+function s.hspcon(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_MZONE,0,1,nil)
+end
 function s.hsptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end

expansions/script/c47390127.lua

@@ -16,11 +16,11 @@ function s.splimit(e,se,sp,st)
 	return e:GetHandler():GetLocation()~=LOCATION_EXTRA
 end
 function s.mfilter(c)
-    return c:IsType(TYPE_MONSTER) and aux.IsCodeListed(c,47390101)
+    return c:IsType(TYPE_MONSTER) and aux.IsCodeListed(c,47390101) and c:IsType(TYPE_MONSTER)
 	 and (c:IsLocation(LOCATION_ONFIELD) or not Duel.IsExistingMatchingCard(Card.IsSetCard,c:GetControler(),LOCATION_MZONE,0,1,nil,0xca5))
 end
 function s.mfilter2(c)
-    return c:IsSetCard(0x3ca5) and (c:IsLocation(LOCATION_ONFIELD)
+    return c:IsSetCard(0x3ca5) and (c:IsLocation(LOCATION_ONFIELD) and c:IsType(TYPE_MONSTER)
 	 or not Duel.IsExistingMatchingCard(Card.IsSetCard,c:GetControler(),LOCATION_MZONE,0,1,nil,0xca5))
 end
 function s.cfilter(c)

expansions/script/c47390128.lua

@@ -22,11 +22,11 @@ function s.sprop(g)
 	Duel.SendtoGrave(g,REASON_COST)
 end
 function s.mfilter(c)
-    return c:IsType(TYPE_MONSTER) and aux.IsCodeListed(c,47390101)
+    return c:IsType(TYPE_MONSTER) and aux.IsCodeListed(c,47390101) and c:IsType(TYPE_MONSTER)
 	 and (c:IsLocation(LOCATION_ONFIELD) or not Duel.IsExistingMatchingCard(Card.IsSetCard,c:GetControler(),LOCATION_MZONE,0,1,nil,0xca5))
 end
 function s.mfilter2(c)
-    return c:IsSetCard(0x3ca5) and (c:IsLocation(LOCATION_ONFIELD)
+    return c:IsSetCard(0x3ca5) and (c:IsLocation(LOCATION_ONFIELD) and c:IsType(TYPE_MONSTER)
 	 or not Duel.IsExistingMatchingCard(Card.IsSetCard,c:GetControler(),LOCATION_MZONE,0,1,nil,0xca5))
 end
 function s.spsummon(c)

expansions/script/c96038003.lua

@@ -40,12 +40,12 @@ function cm.initial_effect(c)
 end
 --equip
 function cm.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	local c=e:GetHandler()
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 		and Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
 	Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
-	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,e:GetHandler(),1,0,0)
 end
 function cm.eqlimit(e,c)
 	return e:GetOwner()==c
@@ -91,6 +91,7 @@ function cm.thfilter(c)
 	return c:IsSetCard(0x5ef7) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	local c=e:GetHandler()
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_SUMMON,nil,0,0,0)
@@ -99,19 +100,14 @@ 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)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil)
-	if #g>0 then
-		Duel.SendtoHand(g,nil,REASON_EFFECT)
-		Duel.ConfirmCards(1-tp,g)
-		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.SelectYesNo(tp,aux.Stringid(m,3)) then end
-		Duel.BreakEffect()
+	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 sg=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil)
-		if sg:GetCount()>0 then
-			Duel.Summon(tp,sg:GetFirst(),true,nil)
+		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