ndyd

expansions/script/c12034000.lua

@@ -65,17 +65,17 @@ function sr_kmmm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local b2=(Duel.IsPlayerCanDraw(tp,2))
 	if chk==0 then
 		local chkf=tp
-		local mg=Duel.GetFusionMaterial(tp)
+		local mg=Duel.GetFusionMaterial(tp,LOCATION_MZONE+LOCATION_HAND)
 		local mg1=Duel.GetMatchingGroup(sr_kmmm.mfilter1,tp,LOCATION_HAND+LOCATION_ONFIELD,0,c)
 		mg:Merge(mg1)
 		if c:IsCode(12034003) then
-		   local mg0=mg:Filter(Card.IsLocation,nil,LOCATION_ONFIELD)
+		   local mg0=mg:Filter(Card.IsLocation,nil,LOCATION_MZONE)
 		   mg:Sub(mg0)
 		end
 		local res=Duel.IsExistingMatchingCard(sr_kmmm.spfilter1,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg,nil,chkf)
 		if res then return true end
 		if not res and c:IsCode(12034002) then
-			local mg2=Duel.GetMatchingGroup(sr_kmmm.mfilter1,tp,0,LOCATION_ONFIELD,nil):Filter(sr_kmmm.mfilter_im,nil,e)
+			local mg2=Duel.GetMatchingGroup(sr_kmmm.mfilter1,tp,0,LOCATION_MZONE,nil):Filter(sr_kmmm.mfilter_im,nil,e)
 			mg:Merge(mg2)
 			local res1=Duel.IsExistingMatchingCard(sr_kmmm.spfilter2,tp,LOCATION_EXTRA,0,1,nil,e,tp,mg,nil,chkf)
 			res=res1
@@ -126,8 +126,8 @@ function sr_kmmm.spop(e,tp,eg,ep,ev,re,r,rp)
 		  Duel.Draw(tp,2,REASON_EFFECT)
 	end
 	local chkf=tp
-	local mg=Duel.GetFusionMaterial(tp):Filter(sr_kmmm.filter1,nil,e)
-	local mg1=Duel.GetMatchingGroup(sr_kmmm.mfilter1,tp,LOCATION_HAND+LOCATION_ONFIELD,0,c)
+	local mg=Duel.GetFusionMaterial(tp,LOCATION_MZONE+LOCATION_HAND):Filter(sr_kmmm.filter1,nil,e)
+	local mg1=Duel.GetMatchingGroup(sr_kmmm.mfilter1,tp,LOCATION_HAND+LOCATION_MZONE,0,c)
 	mg:Merge(mg1)
 	local mg3=Group.FromCards()
 	local sg3=nil
@@ -240,6 +240,7 @@ function sr_kmmm.spop1(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and Duel.IsPlayerCanSpecialSummonMonster(tp,m,0xfa3,0x11,1400,0,4,RACE_BEAST,ATTRIBUTE_FIRE) then
+		--c:AddMonsterAttribute(TYPE_SPELL+TYPE_EFFECT)
 		c:AddMonsterAttribute(TYPE_NORMAL)
 		local iss=Duel.SpecialSummonStep(c,0,tp,tp,true,false,POS_FACEUP)
 		--redirect

expansions/script/c12038005.lua

@@ -85,20 +85,20 @@ function cm.negcon(e,tp,eg,ep,ev,re,r,rp)
 	return true
 end
 function cm.filter(c,rc)
-	return c:IsAbleToHand() and c:IsCode(rc:GetCode()) and not c:IsCode(table.unpack(Srprzm_setback))
+	return c:IsAbleToHand() and c:IsCode(rc:GetCode()) and not rc:IsCode(table.unpack(Srprzm_setback))
 end
 function cm.negtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local rc=re:GetHandler()
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,1,rc,rc) end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,0)
-	Srprzm_setback[#Srprzm_setback+1]=rc:GetCode()
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,0)  
 end
 function cm.negop(e,tp,eg,ep,ev,re,r,rp)
 	local rc=re:GetHandler()
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE)
 	local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,1,1,rc,rc)
 	if g:GetCount()>0 then
-		Duel.SendtoHand(g,tp,REASON_EFFECT)
+		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
+		Srprzm_setback[#Srprzm_setback+1]=rc:GetCode()
 	end
 end
\ No newline at end of file