ndyd

expansions/script/c16107109.lua

@@ -62,7 +62,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return ct>1 and not Duel.IsPlayerAffectedByEffect(tp,59822133)
 		and mg:CheckSubGroup(cm.xyzfilter0,2,2,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local sg1=mg:SelectSubGroup(tp,cm.xyzfilter0,true,2,2,e,tp)
+	local sg1=mg:SelectSubGroup(tp,cm.xyzfilter0,false,2,2,e,tp)
 	Duel.SetTargetCard(sg1)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,sg1,sg1:GetCount(),0,0)
 end
@@ -81,9 +81,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	tc1:RegisterEffect(e1,true)
 	local e2=e1:Clone()
 	tc2:RegisterEffect(e2,true)
-	Duel.SpecialSummonStep(tc1,0,tp,tp,false,false,POS_FACEUP)
-	Duel.SpecialSummonStep(tc2,0,tp,tp,false,false,POS_FACEUP)
-	Duel.SpecialSummonComplete()
+	Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	Duel.BreakEffect()
 	local sg=Group.FromCards(tc1,tc2)
 	local xyzg=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_EXTRA,0,nil,sg,2)
@@ -97,15 +95,27 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 				opt=Duel.SelectOption(tp,aux.Stringid(m,1))+1
 			end
 			if opt==0 then
-			   local xyz1=xyzg1:Select(tp,1,1,nil):GetFirst()
-			   xyz1:SetMaterial(sg)
-			   Duel.Overlay(xyz1,sg)
-			   Duel.SpecialSummon(xyz1,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
-			   xyz1:CompleteProcedure()
+				local xyz1=xyzg1:Select(tp,1,1,nil):GetFirst()
+				xyz1:SetMaterial(sg)
+				local mg=tc1:GetOverlayGroup()
+				local mg2=tc2:GetOverlayGroup()
+				if mg:GetCount()~=0 or mg2:GetCount()~=0 then
+					Duel.Overlay(xyz1,mg)
+					Duel.Overlay(xyz1,mg2)
+				end
+				Duel.Overlay(xyz1,sg)
+				Duel.SpecialSummon(xyz1,SUMMON_TYPE_XYZ,tp,tp,false,false,  POS_FACEUP)
+				xyz1:CompleteProcedure()
 			else
-			   Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-			   local xyz=xyzg:Select(tp,1,1,nil):GetFirst()
-			   Duel.XyzSummon(tp,xyz,g)
+				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+				local xyz=xyzg:Select(tp,1,1,nil):GetFirst()
+				local mg=tc1:GetOverlayGroup()
+				local mg2=tc2:GetOverlayGroup()
+				if mg:GetCount()~=0 or mg2:GetCount()~=0 then
+					 Duel.Overlay(xyz,mg)
+					 Duel.Overlay(xyz,mg2)
+				end
+				Duel.XyzSummon(tp,xyz,g)
 			end
 end
 function cm.spfilter(c,mg,ct)

expansions/script/c33700199.lua

@@ -38,13 +38,13 @@ function c33700199.filter(c,e,tp)
 end
 function c33700199.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingMatchingCard(c33700199.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE)
+		and Duel.IsExistingMatchingCard(c33700199.filter,tp,LOCATION_HAND+LOCATION_DECK,0,1,nil,e,tp) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_DECK)
 end
 function c33700199.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c33700199.filter),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c33700199.filter),tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end
@@ -55,7 +55,7 @@ end
 function c33700199.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(c33700199.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
 end
 function c33700199.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end